新增删除开关

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/afterwaring/XCFYDataTransferService.java

@@ -114,7 +114,7 @@ public class XCFYDataTransferService {
         log.info("开始同步v_YBKF_check_list数据,获取HISID:{}", hsdId);
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("HISID", hsdId);
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         Integer count = transferDataList(querySql, checkListInsertSql, paramMap, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
@@ -148,7 +148,7 @@ public class XCFYDataTransferService {
         log.info("开始同步V_YBKF_PRESCRIPTION_ORDER数据,获取住院号:{}", vistNo);
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("INP_OUTPATIENT_NUMBER", vistNo);
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         Integer count = transferDataList(querySql, prescriptionOrderInsertSql, paramMap, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
@@ -176,7 +176,7 @@ public class XCFYDataTransferService {
         log.info("开始同步V_YBKF_OPERATION数据,获取住院号/门诊号:{}", visitNo);
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("VISIT_NO", visitNo);
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         Integer count = transferDataList(querySql, operationInsertSql, paramMap, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob.java

@@ -56,7 +56,7 @@ public class XCFYDataV_MEDICAL_RECORD_HOMEPAGEJob implements Job {
     }
 
     public void transferHomePage(Map<String, String> dischargeMethodMap) {
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         String querySql = "select * from V_YBKF_MASTER_ADMISSION_BILL where hisid is not null and to_char(bill_date,'yyyy-MM-dd')=to_char(sysdate-10,'yyyy-MM-dd') ";
         Date endBillDate = DateUtil.offsetDay(new Date(), -10);
         log.info("开始10天前master_admission_bill数据,获取同步日期:{}", endBillDate);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_master_admission_billJob.java

@@ -89,7 +89,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         String sql = "select * from V_YBKF_MASTER_ADMISSION_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s  order by bill_date asc";
         Date endBillDate = DateUtil.yesterday();
         endBillDate = DateUtil.endOfDay(endBillDate);
@@ -213,7 +213,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
      * @return
      */
     public Integer transferHospSettleDetail(String hisId) {
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         try {
 //            List<DictModel> cateGoriesList = sysDictService.getDictItems(Constant.DICT_CATEGORIES_ITEMS_KEY);
             Map<String, String> cateGoriesMap = CommonUtil.getCategoriesItemsMap();
@@ -279,7 +279,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
     }
 
     public Integer transferMedicalRecordHomePage(String zyh, Map<String, String> dischargeMethodMap) {
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         String querySql = "select * from V_YBKF_MEDICAL_RECORD_HOMEPAGE where ZYH=:ZYH";
 
         log.info("开始同步V_YBKFMEDICAL_RECORD_HOMEPAGE数据,获取zyh:{}", zyh);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_outpatient_settle_billJob.java

@@ -86,7 +86,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
         String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_BILL where hisid is not null and pay_method!='自费' and bill_date<=:END_BILL_DATE %s and rownum<=1000 order by bill_date asc";
         Date endBillDate = DateUtil.yesterday();
         endBillDate = DateUtil.endOfDay(endBillDate);
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         log.info("switch_open:{}", openStr);
         while (true) {
             String whereSql = "";
@@ -177,7 +177,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
 
     public Integer getDetailByHisId(String hisId) {
         String sql = "select * from V_YBKF_OUTPATIENT_SETTLE_DEL where hisid=:HISID and item_id is not null";
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         Map<String, String> cateGoriesMap = CommonUtil.getCategoriesItemsMap();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("HISID", hisId);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/XCFYDatav_outpatient_settle_detailsJob.java

@@ -63,7 +63,7 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
         for (DictModel dictModel : cateGoriesList) {
             cateGoriesMap.put(dictModel.getText(), dictModel.getValue());
         }
-        Object openStr = redisTemplate.opsForValue().get(Constant.JOB_DELETE_OLD_DATE_SWITCH);
+        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
         while (true) {
             log.info("开始同步V_YBKF_OUTPATIENT_SETTLE_DEL数据");
             String whereSql = "";