视图数据更新

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

@@ -144,11 +144,11 @@ public class XCFYDataTransferService {
             public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                 dataMap.put("CREATE_BY", "auto");
                 dataMap.put("CREATE_TIME", new Date());
-                String treatmentTypeSrc = dataMap.get("TRETMENT_TYPE").toString();
+                String treatmentTypeSrc = dataMap.get("TREATMENT_TYPE").toString();
                 if("住院".equals(treatmentTypeSrc)){
-                    dataMap.put("TRETMENT_TYPE","1");
+                    dataMap.put("TREATMENT_TYPE","1");
                 }else if("门诊".equals(treatmentTypeSrc)){
-                    dataMap.put("TRETMENT_TYPE","2");
+                    dataMap.put("TREATMENT_TYPE","2");
                 }
                 Object patientGender = dataMap.get("PATIENT_GENDER");
                 dataMap.put("PATIENT_GENDER", CommonUtil.getMedicalSex(patientGender));

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

@@ -111,9 +111,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     log.error("hisid:{} 未查询到住院结算清单", hisId);
                     return false;
                 }
-                String diagCode = dataMap.getOrDefault("ADMISSION_DISEASE_ID", "").toString();
-                if (StringUtils.isNotBlank(diagCode)) {
-                    String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode);
+                Object diagCode = dataMap.get("ADMISSION_DISEASE_ID");
+                if (null != diagCode && StringUtils.isNotBlank(diagCode.toString())) {
+                    String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode.toString());
                     if (null != ybDiagCode) {
                         dataMap.put("YB_ADMISSION_DISEASE_ID", ybDiagCode[0]);
                         dataMap.put("YB_ADMISSION_DISEASE_NAME", ybDiagCode[1]);
@@ -122,9 +122,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     }
                 }
 
-                String disDiagCode = dataMap.getOrDefault("DISCHARGE_DISEASE_ID_MAIN", "").toString();
-                if (StringUtils.isNotBlank(disDiagCode)) {
-                    String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(disDiagCode);
+                Object disDiagCode = dataMap.get("DISCHARGE_DISEASE_ID_MAIN");
+                if (null != disDiagCode && StringUtils.isNotBlank(disDiagCode.toString())) {
+                    String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(disDiagCode.toString());
                     if (null != ybDiagCode) {
                         dataMap.put("YB_DISCHARGE_DISEASE_ID_MAIN", ybDiagCode[0]);
                         dataMap.put("YB_DISCHARGE_DISEASE_NAME_MAIN", ybDiagCode[1]);
@@ -133,6 +133,9 @@ public class XCFYDatav_master_admission_billJob implements Job {
                     }
                 }
                 Object patientAge = dataMap.getOrDefault("PATIENT_AGE", "0天");
+                if (patientAge == null){
+                    patientAge = "0天";
+                }
                 Integer days = DateTimeUtil.getDayByAgeStr(patientAge.toString());
                 Object visitTime = dataMap.get("VISIT_TIME");
                 Object patientBirthday = dataMap.get("PATIENT_BIRTHDAY");