更新门诊和住院数据入库

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

@@ -113,14 +113,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();
-                Integer count = transferHospSettleDetail(hisId);
-                if (null == count || count <= 0) {
-                    log.error("hisid:{} 未查询到住院结算清单", hisId);
-                    return false;
-                }
-
-                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());
@@ -138,7 +130,13 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     dataMap.put("ADMISSION_DISEASE_ID", null);
                     dataMap.put("ADMISSION_DISEASE_NAME", null);
                 }
+                Integer count = transferHospSettleDetail(hisId);
 
+                if (null == count || count <= 0) {
+                    log.error("hisid:{} 未查询到住院结算清单", hisId);
+                    return false;
+                }
+                masterAdmissionBillService.lambdaUpdate().eq(MasterAdmissionBill::getHisid, hisId).remove();
                 Object disDiagCode = dataMap.get("DISCHARGE_DISEASE_ID_MAIN");
                 if (null != disDiagCode && StringUtils.isNotBlank(disDiagCode.toString())) {
                     String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(disDiagCode.toString());

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

@@ -101,18 +101,6 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
             @Override
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                 dataMap.put("PAY_METHOD", 1);
-
-
-                String hisId = dataMap.get("HISID").toString();
-                Integer count = getDetailByHisId(hisId);
-                if (null == count || count <= 0) {
-                    log.error("hisid:{} 未查询到门诊结算清单", hisId);
-                    return false;
-                }
-                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");
                 if (null != diagCode && StringUtils.isNotBlank(diagCode.toString())) {
                     String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode.toString());
@@ -129,6 +117,17 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                     dataMap.put("ADMISSION_DISEASE_ID", "");
                     dataMap.put("ADMISSION_DISEASE_NAME", "");
                 }
+                String hisId = dataMap.get("HISID").toString();
+                Integer count = getDetailByHisId(hisId);
+                if (null == count || count <= 0) {
+                    log.error("hisid:{} 未查询到门诊结算清单", hisId);
+                    return false;
+                }
+                outpatientSettleBillService.lambdaUpdate().eq(OutpatientSettleBill::getHisid, hisId).remove();
+
+                dataMap.put("CREATE_BY", "auto");
+                dataMap.put("CREATE_TIME", new Date());
+
                 Object patientAge = dataMap.get("PATIENT_AGE");
                 if (patientAge == null) {
                     patientAge = "0天";