Merge remote-tracking branch 'origin/master'

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

@@ -19,6 +19,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Description: mid_incident_audit
  * @Author: jeecg-boot
@@ -83,10 +85,39 @@ public class MidIncidentAudit implements Serializable {
     @Excel(name = "病人年龄;", width = 15)
     @ApiModelProperty(value = "病人年龄;")
     private java.lang.String patientAge;
+
     /**病人性别;*/
     @Excel(name = "病人性别;", width = 15)
     @ApiModelProperty(value = "病人性别;")
     private java.lang.String patientGender;
+//    inpatient_area	true	char	20	病区
+    /**
+     * 就诊类型为住院时候必填
+     */
+    /**病人性别;*/
+    @Excel(name = "病区;就诊类型为住院时候必填", width = 15)
+    @ApiModelProperty(value = "病区;就诊类型为住院时候必填")
+    private String inpatientArea;
+
+//    number_beds	true	char	10	床位号；护士办理入院时候必填
+    /**
+     * 就诊类型为住院时候必填
+     */
+    @Excel(name = "床位号；护士办理入院时候必填", width = 15)
+    @ApiModelProperty(value = "床位号；护士办理入院时候必填")
+    private String numberBeds;
+//    allergies	true	char	200	过敏史
+    /**
+     * 就诊类型为住院时候必填
+     * 过敏史
+     */
+    @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)
     @ApiModelProperty(value = "住院号/门诊号")

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

@@ -88,7 +88,31 @@ public class MidIncidentVisitLog implements Serializable {
 	@Excel(name = "病人性别;", width = 15)
     @ApiModelProperty(value = "病人性别;")
     private java.lang.String patientGender;
-	/**项目总金额;*/
+    /**病人性别;*/
+    @Excel(name = "病区;就诊类型为住院时候必填", width = 15)
+    @ApiModelProperty(value = "病区;就诊类型为住院时候必填")
+    private String inpatientArea;
+
+//    number_beds	true	char	10	床位号；护士办理入院时候必填
+    /**
+     * 就诊类型为住院时候必填
+     */
+    @Excel(name = "床位号；护士办理入院时候必填", width = 15)
+    @ApiModelProperty(value = "床位号；护士办理入院时候必填")
+    private String numberBeds;
+//    allergies	true	char	200	过敏史
+    /**
+     * 就诊类型为住院时候必填
+     * 过敏史
+     */
+    @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)
     @ApiModelProperty(value = "项目总金额;")
     private java.lang.Double totoalAmount;

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")
@@ -65,6 +70,23 @@ public class MidIncidentWarningVO {
      */
     @NotBlank(message = "医师级别不能为空")
     private String doctor_level;
+//    inpatient_area	true	char	20	病区
+    /**
+     * 就诊类型为住院时候必填
+     */
+    private String inpatient_area;
+
+//    number_beds	true	char	10	床位号；护士办理入院时候必填
+    /**
+     * 就诊类型为住院时候必填
+     */
+    private String number_beds;
+//    allergies	true	char	200	过敏史
+    /**
+     * 就诊类型为住院时候必填
+     * 过敏史
+     */
+    private String allergies;
     /**
      * 所有项目总金额
      */

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

@@ -344,6 +344,7 @@ public class RuleEngine {
         midIncidentVisitLog.setPatientGender(midIncidentWarningVO.getPatient_gender());
         midIncidentVisitLog.setDischargeStatus(midIncidentWarningVO.getDischarge_status());
         midIncidentVisitLog.setTotoalAmount(midIncidentWarningVO.getTotoal_amount());
+        midIncidentVisitLog.setInsuranceType(midIncidentWarningVO.getInsurance_type());
         if (CollectionUtil.isNotEmpty(midIncidentWarningVO.getDiagnoses())) {
             midIncidentVisitLog.setDiagnoses(JSON.toJSONString(midIncidentWarningVO.getDiagnoses()));
         }
@@ -369,6 +370,9 @@ public class RuleEngine {
         midIncidentVisitLog.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
         midIncidentVisitLog.setMedicalDeptName(midIncidentWarningVO.getMedical_dept_name());
         midIncidentVisitLog.setVisitType(midIncidentWarningVO.getVisit_type());
+        midIncidentVisitLog.setAllergies(midIncidentWarningVO.getAllergies());
+        midIncidentVisitLog.setInpatientArea(midIncidentWarningVO.getInpatient_area());
+        midIncidentVisitLog.setNumberBeds(midIncidentWarningVO.getNumber_beds());
         midIncidentVisitLogService.save(midIncidentVisitLog);
         if (CollectionUtil.isNotEmpty(midIncidentWarningVO.getAdvice_details())) {
             List<MidIncidentVisitDetailLog> midIncidentVisitDetailLogList = new ArrayList<>();
@@ -450,6 +454,10 @@ public class RuleEngine {
         midIncidentAudit.setPatientAge(midIncidentWarningVO.getPatient_age());
         midIncidentAudit.setPatientGender(midIncidentWarningVO.getPatient_gender());
         midIncidentAudit.setDischargeStatus(midIncidentWarningVO.getDischarge_status());
+        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");