新增删除开关

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

@@ -114,9 +114,6 @@ public class XCFYDatav_master_admission_billJob implements Job {
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                 dataMap.put("PAY_METHOD", 1);
                 String hisId = dataMap.get("HISID").toString();
-                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
-                    masterAdmissionBillService.lambdaUpdate().eq(MasterAdmissionBill::getHisid, hisId).remove();
-                }
                 Integer count = transferHospSettleDetail(hisId);
                 String billDateStr = DateUtils.date2Str((Date) dataMap.get("BILL_DATE"), DateUtils.date_sdf.get());
                 redisTemplate.opsForHash().put(Constant.JOB_CONTINUE_PARAM, "MASTER_ADMISSION_BILL", billDateStr);
@@ -124,6 +121,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     log.error("hisid:{} 未查询到住院结算清单", hisId);
                     return false;
                 }
+                if(null != openStr && Constant.SWITCH_OPEN.equals(openStr)) {
+                    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());