事后稽核引擎

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/HospitalizatioSettleDetail.java

@@ -95,11 +95,11 @@ public class HospitalizatioSettleDetail implements Serializable {
 	/**最小包装单位;如结算明细中不存在，可从药品、诊疗目录中关联，没有设为“”。*/
 	@Excel(name = "最小包装单位;如结算明细中不存在，可从药品、诊疗目录中关联，没有设为“”。", width = 15)
     @ApiModelProperty(value = "最小包装单位;如结算明细中不存在，可从药品、诊疗目录中关联，没有设为“”。")
-    private java.lang.Integer packageUnit;
+    private java.lang.String packageUnit;
 	/**单价;该项目单价*/
 	@Excel(name = "单价;该项目单价", width = 15)
     @ApiModelProperty(value = "单价;该项目单价")
-    private java.lang.Integer unitPrice;
+    private java.lang.Double unitPrice;
 	/**数量;该项目数量*/
 	@Excel(name = "数量;该项目数量", width = 15)
     @ApiModelProperty(value = "数量;该项目数量")

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

@@ -55,7 +55,10 @@ public class AfterWaringJob implements Job {
         String jsonStr = JSON.toJSONString(afterIncidentDetailLogList);
         List<Map> itemList = JSON.parseArray(jsonStr, Map.class);
         List<Map<String,Object>> realItemList = new ArrayList<>();
-        realItemList.addAll((Collection<? extends Map<String, Object>>) itemList);
+        for(Map itemMap : itemList){
+            realItemList.add(itemMap);
+        }
+//        realItemList.addAll((Collection<? extends Map<String, Object>>) itemList);
         for (AfterIncidentDetailLog afterIncidentDetailLog : afterIncidentDetailLogList) {
             ruleEngine.dealAfterInterfaceEngin(afterwardsAudit, afterIncidentDetailLog, realItemList);
         }

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

@@ -64,6 +64,7 @@ public class AfterWaringLogJob implements Job {
         AfterIncidentDetailLog afterIncidentDetailLog = null;
         for(HospitalizatioSettleDetail hospitalizatioSettleDetail : hospitalizatioSettleDetails){
             afterIncidentDetailLog = new AfterIncidentDetailLog();
+
             afterIncidentDetailLog.setAfterIncidentLogId(afterIncidentLog.getId());
             afterIncidentDetailLog.setMedical_diagnose_name_str(masterAdmissionBill.getDischargeDiseaseNameMain());
             afterIncidentDetailLog.setMedical_diagnose_code_str(masterAdmissionBill.getDischargeDiseaseIdMain());
@@ -77,6 +78,15 @@ public class AfterWaringLogJob implements Job {
             afterIncidentDetailLog.setDoctorName(afterIncidentLog.getDoctorName());
 //            sysUserService.lambdaQuery().eq("")
 //            afterIncidentDetailLog.setDoctorLevel();
+            afterIncidentDetailLog.setUseDay(hospitalizatioSettleDetail.getUseDay());
+            afterIncidentDetailLog.setDoseForm(hospitalizatioSettleDetail.getDosageForm());
+            afterIncidentDetailLog.setDoseUnit(hospitalizatioSettleDetail.getPackageUnit());
+            afterIncidentDetailLog.setPrice(new BigDecimal(hospitalizatioSettleDetail.getUnitPrice()));
+            afterIncidentDetailLog.setDscgBed(masterAdmissionBill.getAdmBed());
+            afterIncidentDetailLog.setExpenseCategory(hospitalizatioSettleDetail.getPCategory());
+//            afterIncidentDetailLog.setInspectionSite();
+            afterIncidentDetailLog.setOutHospDate(masterAdmissionBill.getDischargeDate());
+            afterIncidentDetailLogList.add(afterIncidentDetailLog);
         }
     }