Bladeren bron

视图数据更新

0027005599 2 jaren geleden
bovenliggende
commit
c739758cd9

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

@@ -99,7 +99,7 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                     }
                     dataMap.put("CREATE_BY", "auto");
                     dataMap.put("CREATE_TIME", new Date());
-                    Object diagCode = dataMap.getOrDefault("ADMISSION_DISEASE_ID", "");
+                    Object diagCode = dataMap.get("ADMISSION_DISEASE_ID");
                     if (null != diagCode && StringUtils.isNotBlank(diagCode.toString())) {
                         String[] ybDiagCode = CommonUtil.getMedicalCodeAndName(diagCode.toString());
                         if (null != ybDiagCode) {
@@ -107,7 +107,10 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                             dataMap.put("YB_ADMISSION_DISEASE_NAME", ybDiagCode[1]);
                         }
                     }
-                    Object patientAge = dataMap.getOrDefault("PATIENT_AGE", "0天");
+                    Object patientAge = dataMap.get("PATIENT_AGE");
+                    if (patientAge == null){
+                        patientAge = "0天";
+                    }
                     Integer days = DateTimeUtil.getDayByAgeStr(patientAge.toString());
                     Object visitTime = dataMap.get("VISIT_TIME");
                     Object patientBirthday = dataMap.get("PATIENT_BIRTHDAY");