视图数据更新

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

@@ -76,7 +76,7 @@ public class AfterWaringLogJob implements Job {
 
             afterIncidentDetailLog.setAfterIncidentLogId(afterIncidentLog.getId());
             afterIncidentDetailLog.setMedicalDiagnoseNameStr(masterAdmissionBill.getYbAdmissionDiseaseName());
-            afterIncidentDetailLog.setMedicalDiagnoseCodeStr(masterAdmissionBill.getYbAdmissionDiseaseId().trim());
+            afterIncidentDetailLog.setMedicalDiagnoseCodeStr(masterAdmissionBill.getYbAdmissionDiseaseId());
             afterIncidentDetailLog.setAmount(hospitalizatioSettleDetail.getCost());
 
             if (StringUtils.isNotBlank(hospitalizatioSettleDetail.getItemId())) {

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

@@ -77,8 +77,8 @@ public class OutpatientAuditLogJob implements Job {
             afterIncidentDetailLog = new AfterIncidentDetailLog();
 
             afterIncidentDetailLog.setAfterIncidentLogId(afterIncidentLog.getId());
-            afterIncidentDetailLog.setMedicalDiagnoseNameStr(outpatientSettleBill.getYbAdmissionDiseaseName().trim());
-            afterIncidentDetailLog.setMedicalDiagnoseCodeStr(outpatientSettleBill.getYbAdmissionDiseaseId().trim());
+            afterIncidentDetailLog.setMedicalDiagnoseNameStr(outpatientSettleBill.getYbAdmissionDiseaseName());
+            afterIncidentDetailLog.setMedicalDiagnoseCodeStr(outpatientSettleBill.getYbAdmissionDiseaseId());
             afterIncidentDetailLog.setAmount(outpatientSettlementDetails.getCost().doubleValue());
 
             if (StringUtils.isNotBlank(outpatientSettlementDetails.getItemId())) {

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

@@ -177,17 +177,14 @@ public class XCFYDatav_outpatient_settle_billJob implements Job {
                         dataMap.put("ITEM_NAME", itemIdArr[1]);
                     }
                 }
-                String pCategory = dataMap.getOrDefault("P_CATEGORY", "").toString();
-                if(StringUtils.isNotBlank(pCategory)){
-                    dataMap.put("P_CATEGORY", cateGoriesMap.getOrDefault(pCategory, pCategory));
-                }else{
-                    //甲类01
-                    dataMap.put("P_CATEGORY", "01");
-                }
 
-                String categoriesItems = dataMap.getOrDefault("CATEGORIES_ITEMS", "").toString();
-                if(StringUtils.isNotBlank(pCategory)) {
-                    dataMap.put("CATEGORIES_ITEMS", cateGoriesMap.getOrDefault(categoriesItems, categoriesItems));
+                //甲类01
+                dataMap.put("P_CATEGORY", "01");
+
+
+                Object categoriesItems = dataMap.get("CATEGORIES_ITEMS");
+                if(null != categoriesItems && StringUtils.isNotBlank(categoriesItems.toString())) {
+                    dataMap.put("CATEGORIES_ITEMS", cateGoriesMap.getOrDefault(categoriesItems.toString(), categoriesItems.toString()));
                 }
                 return true;
             }

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

@@ -72,6 +72,7 @@ public class XCFYDatav_outpatient_settle_detailsJob implements Job {
                 public Boolean transferData(Map<String, Object> dataMap) throws Exception {
                     dataMap.put("CREATE_BY", "auto");
                     dataMap.put("CREATE_TIME", new Date());
+                    dataMap.put("P_CATEGORY", "01");
                     String itemIDHosp = dataMap.getOrDefault("ITEM_ID_HOSP", "").toString();
                     String itemId = dataMap.getOrDefault("ITEM_ID", "").toString();
                     if (StringUtils.isNotBlank(itemIDHosp) && StringUtils.isBlank(itemId)) {