新增删除旧数据逻辑

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

@@ -130,9 +130,9 @@ public class XCFYDataTransferService {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(openStr != null && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    checkListService.lambdaUpdate().eq(CheckList::getHisid, hsdId).remove();
-                }
+
+                checkListService.lambdaUpdate().eq(CheckList::getHisid, hsdId).remove();
+
                 return true;
             }
         });
@@ -162,9 +162,7 @@ public class XCFYDataTransferService {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    prescriptionOrderService.lambdaUpdate().eq(PrescriptionOrder::getInpOutpatientNumber, vistNo).remove();
-                }
+                prescriptionOrderService.lambdaUpdate().eq(PrescriptionOrder::getInpOutpatientNumber, vistNo).remove();
                 return true;
             }
         });
@@ -198,9 +196,7 @@ public class XCFYDataTransferService {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    operationService.lambdaUpdate().eq(Operation::getVisitNo, visitNo).remove();
-                }
+                operationService.lambdaUpdate().eq(Operation::getVisitNo, visitNo).remove();
                 return true;
             }
         });

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

@@ -121,9 +121,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     log.error("hisid:{} 未查询到住院结算清单", hisId);
                     return false;
                 }
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    masterAdmissionBillService.lambdaUpdate().eq(MasterAdmissionBill::getHisid, hisId).remove();
-                }
+
+                masterAdmissionBillService.lambdaUpdate().eq(MasterAdmissionBill::getHisid, hisId).remove();
+
                 Object diagCode = dataMap.get("ADMISSION_DISEASE_ID");
                 if (null != diagCode && StringUtils.isNotBlank(diagCode.toString())) {
                     String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode.toString());
@@ -264,9 +264,7 @@ public class XCFYDatav_master_admission_billJob implements Job {
             }, new TransferDataCallFunction() {
                 @Override
                 public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                    if(Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                        hospitalizatioSettleDetailService.lambdaUpdate().eq(HospitalizatioSettleDetail::getHisid, hisId).remove();
-                    }
+                    hospitalizatioSettleDetailService.lambdaUpdate().eq(HospitalizatioSettleDetail::getHisid, hisId).remove();
                     return true;
                 }
             });
@@ -308,9 +306,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    medicalRecordHomepageService.lambdaUpdate().eq(MedicalRecordHomepage::getZyh, zyh).remove();
-                }
+
+                medicalRecordHomepageService.lambdaUpdate().eq(MedicalRecordHomepage::getZyh, zyh).remove();
+
                 return true;
             }
         });

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

@@ -86,8 +86,6 @@ 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);
-        String openStr = sysDictService.queryDictTextByKey(Constant.JOB_DELETE_OLD_DATE_SWITCH,"SWITCH");;
-        log.info("switch_open:{}", openStr);
         while (true) {
             String whereSql = "";
             Date billDate = getBillDate();
@@ -110,9 +108,8 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                         log.error("hisid:{} 未查询到门诊结算清单", hisId);
                         return false;
                     }
-                    if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                        outpatientSettleBillService.lambdaUpdate().eq(OutpatientSettleBill::getHisid, hisId).remove();
-                    }
+                    outpatientSettleBillService.lambdaUpdate().eq(OutpatientSettleBill::getHisid, hisId).remove();
+
                     dataMap.put("CREATE_BY", "auto");
                     dataMap.put("CREATE_TIME", new Date());
                     Object diagCode = dataMap.get("ADMISSION_DISEASE_ID");
@@ -206,9 +203,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
         }, new TransferDataCallFunction() {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr.toString())) {
-                    outpatientSettlementDetailsService.lambdaUpdate().eq(OutpatientSettlementDetails::getHisid, hisId).remove();
-                }
+                outpatientSettlementDetailsService.lambdaUpdate().eq(OutpatientSettlementDetails::getHisid, hisId).remove();
                 return true;
             }
         });