소스 검색

空指针,门诊问题

0027005599 2 년 전
부모
커밋
26b6ff7283

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

@@ -232,9 +232,9 @@ public class XCFYDataTransferService {
                 //4非医嘱离院
                 //5死亡
                 //9其他
-                String dischargeStatus = dataMap.getOrDefault("DISCHARGE_STATUS", "其他").toString();
-                if (dischargeMethodMap.containsKey(dischargeStatus)) {
-                    dataMap.put("DISCHARGE_STATUS", dischargeMethodMap.get(dischargeStatus));
+                Object dischargeStatus = dataMap.get("DISCHARGE_STATUS");
+                if (null != dischargeStatus && dischargeMethodMap.containsKey(dischargeStatus.toString())) {
+                    dataMap.put("DISCHARGE_STATUS", dischargeMethodMap.get(dischargeStatus.toString()));
                 }
                 return true;
             }

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

@@ -62,7 +62,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
             "cvlserv_pay, hifes_pay, hifmi_pay, hifob_pay, maf_pay, oth_pay, fund_pay_sumamt, " +
             "create_time, create_by, patient_age_days) VALUES (:ID,:HISID,:VISIT_NO,:RECIPE_NO,:PAY_METHOD,:BMI_AREA_ID," +
             ":BMI_AREA_NAME,:HOSPITAL_ID,:HOSPITAL_NAME,:P_LEVEL_YY,:BENEFIT_TYPE,:ADMISSION_DEPT_ID," +
-            ":ADMISSION_DEPT_NAME,:DOCTOR_ID,:DOCTOR_NAME,:REFUND_FALGE,:FEE_OCUR_TIME,:BILL_DATE," +
+            ":ADMISSION_DEPT_NAME,:DOCTOR_ID,:DOCTOR_NAME,:REFUND_FLAG,:FEE_OCUR_TIME,:BILL_DATE," +
             ":REFUND_DATE,:PATIENT_ID,:PATIENT_NAME,:PATIENT_GENDER,:PATIENT_BIRTHDAY,:PATIENT_AGE," +
             ":VISIT_TIME,:BENEFIT_GROUP_ID,:CLAIM_TYPE,:IF_LOCAL_FLAG,:ADMISSION_DISEASE_ID," +
             ":ADMISSION_DISEASE_NAME,:YB_ADMISSION_DISEASE_ID,:YB_ADMISSION_DISEASE_NAME:MEDFEE_SUMAMT,:FULAMT_OWNPAY_AMT,:OVERLMT_SELFPAY,:PRESELFPAY_AMT," +