就诊日期添加

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

@@ -83,6 +83,19 @@ public class MidIncidentAudit implements Serializable {
     @Excel(name = "违规金额", width = 15)
     @ApiModelProperty(value = "违规金额")
     private java.lang.Double amount;
+    /**入院日期*/
+    @Excel(name = "入院日期", width = 15, format =  "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")
+    @ApiModelProperty(value = "入院日期")
+    private java.util.Date inHospDate;
+    /**入院日期*/
+    @Excel(name = "就诊日期", width = 15, format =  "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")
+    @ApiModelProperty(value = "就诊日期")
+    private java.util.Date visitTime;
+
 	/**反馈结果*/
 	@Excel(name = "反馈结果", width = 15)
     @ApiModelProperty(value = "反馈结果")

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

@@ -98,6 +98,12 @@ public class MidIncidentVisitLog implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "入院日期")
     private java.util.Date inHospDate;
+    /**入院日期*/
+    @Excel(name = "就诊日期", width = 15, format =  "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")
+    @ApiModelProperty(value = "就诊日期")
+    private java.util.Date visitTime;
 	/**诊断编码*/
 	@Excel(name = "诊断编码", width = 15)
     @ApiModelProperty(value = "诊断编码")

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

@@ -1,9 +1,13 @@
 package org.jeecg.modules.medical.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,7 +25,15 @@ public class MidIncidentWarningVO {
     private String medical_dept_name;//科室名称
     @NotBlank(message = "就诊类型不能为空")
     private String visit_type;//就诊类型（1住院、2门诊）
-    private String in_hosp_date;//入院日期（就诊类型是住院的非空,格式：YYYYMMDD）
+    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")
+//    @ApiModelProperty(value = "就诊时间")
+    /**
+     * 就诊时间
+     * yyyy-MM-dd HH:mm:ss
+     */
+    private String visit_time;
     @NotBlank(message = "病人ID不能为空")
     private String patient_id;//病人ID
     @NotBlank(message = "病人姓名不能为空")

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

@@ -350,12 +350,20 @@ public class RuleEngine {
         midIncidentVisitLog.setDoctorAdviceNo(midIncidentWarningVO.getDoctor_advice_no());
         try {
             if (StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
-                Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyyMMdd");
+                Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyy-MM-dd HH:mm:ss");
                 midIncidentVisitLog.setInHospDate(inHospDate);
             }
         } catch (ParseException e) {
             log.error(e.getMessage(), e);
         }
+        try {
+            if (StringUtils.isNotBlank(midIncidentWarningVO.getVisit_time())) {
+                Date visitTime = DateUtils.parseDate(midIncidentWarningVO.getVisit_time(), "yyyy-MM-dd HH:mm:ss");
+                midIncidentVisitLog.setVisitTime(visitTime);
+            }
+        } catch (ParseException e) {
+            log.error(e.getMessage(), e);
+        }
         Date now = new Date(System.currentTimeMillis());
         midIncidentVisitLog.setCreateTime(now);
         midIncidentVisitLog.setMedicalDeptCode(midIncidentWarningVO.getMedical_dept_code());
@@ -438,6 +446,22 @@ public class RuleEngine {
         midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
         midIncidentAudit.setNoticeType("事中预警");
         midIncidentAudit.setAmount((double) 0);
+        try {
+            if (StringUtils.isNotBlank(midIncidentWarningVO.getIn_hosp_date())) {
+                Date inHospDate = DateUtils.parseDate(midIncidentWarningVO.getIn_hosp_date(), "yyyy-MM-dd HH:mm:ss");
+                midIncidentAudit.setInHospDate(inHospDate);
+            }
+        } catch (ParseException e) {
+            log.error(e.getMessage(), e);
+        }
+        try {
+            if (StringUtils.isNotBlank(midIncidentWarningVO.getVisit_time())) {
+                Date visitTime = DateUtils.parseDate(midIncidentWarningVO.getVisit_time(), "yyyy-MM-dd HH:mm:ss");
+                midIncidentAudit.setVisitTime(visitTime);
+            }
+        } catch (ParseException e) {
+            log.error(e.getMessage(), e);
+        }
         midIncidentAuditService.save(midIncidentAudit);
         double allAmount = 0;
         if (null != midIncidentWarningVO.getTotoal_amount() && midIncidentWarningVO.getTotoal_amount() > 0) {