0027005599 hace 2 años
padre
commit
e838133469

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

@@ -114,6 +114,9 @@ public class MidIncidentAudit implements Serializable {
     @Excel(name = "过敏史", width = 15)
     @ApiModelProperty(value = "过敏史")
     private String allergies;
+    @Excel(name = "险种类别;1.医疗、2.工伤、3.生育", width = 15)
+    @ApiModelProperty(value = "险种类别;1.医疗、2.工伤、3.生育")
+    private String insuranceType;
 
 	/**住院号/门诊号*/
 	@Excel(name = "住院号/门诊号", width = 15)

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

@@ -25,6 +25,11 @@ public class MidIncidentWarningVO {
     private String medical_dept_name;//科室名称
     @NotBlank(message = "就诊类型不能为空")
     private String visit_type;//就诊类型(1住院、2门诊)
+    /**
+     * 险种类别
+     * 1.医疗、2.工伤、3.生育
+     */
+    private String insurance_type;
     private String in_hosp_date;//入院日期(就诊类型是住院的非空,格式:yyyy-MM-dd HH:mm:ss)
 //    @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
 //    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")

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

@@ -456,6 +456,7 @@ public class RuleEngine {
         midIncidentAudit.setAllergies(midIncidentWarningVO.getAllergies());
         midIncidentAudit.setInpatientArea(midIncidentWarningVO.getInpatient_area());
         midIncidentAudit.setNumberBeds(midIncidentWarningVO.getNumber_beds());
+        midIncidentAudit.setInsuranceType(midIncidentWarningVO.getInsurance_type());
         try {
             if (StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
                 Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyy-MM-dd HH:mm:ss");