0027005599 2 лет назад
Родитель
Сommit
b9f6b1c680

+ 16 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAudit.java

@@ -71,6 +71,22 @@ public class MidIncidentAudit implements Serializable {
 	@Excel(name = "患者姓名", width = 15)
     @ApiModelProperty(value = "患者姓名")
     private java.lang.String patientName;
+    /**医师级别;*/
+    @Excel(name = "医师级别;", width = 15)
+    @ApiModelProperty(value = "医师级别;")
+    private java.lang.String doctorLevel;
+    /**离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他*/
+    @Excel(name = "离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他", width = 15)
+    @ApiModelProperty(value = "离院方式;1.医嘱离院 2.医嘱转院、转社区、转卫生机构 3.非医嘱离院 4.死亡 9.其他")
+    private java.lang.String dischargeStatus;
+    /**病人年龄;*/
+    @Excel(name = "病人年龄;", width = 15)
+    @ApiModelProperty(value = "病人年龄;")
+    private java.lang.String patientAge;
+    /**病人性别;*/
+    @Excel(name = "病人性别;", width = 15)
+    @ApiModelProperty(value = "病人性别;")
+    private java.lang.String patientGender;
 	/**住院号/门诊号*/
 	@Excel(name = "住院号/门诊号", width = 15)
     @ApiModelProperty(value = "住院号/门诊号")

+ 4 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -446,6 +446,10 @@ public class RuleEngine {
         midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
         midIncidentAudit.setNoticeType("事中预警");
         midIncidentAudit.setAmount((double) 0);
+        midIncidentAudit.setDoctorLevel(midIncidentWarningVO.getDoctor_level());
+        midIncidentAudit.setPatientAge(midIncidentWarningVO.getPatient_age());
+        midIncidentAudit.setPatientGender(midIncidentWarningVO.getPatient_gender());
+        midIncidentAudit.setDischargeStatus(midIncidentWarningVO.getDischarge_status());
         try {
             if (StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
                 Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyy-MM-dd HH:mm:ss");