浏览代码

文书内容结构化实体类重新生成

chengyao 4 年之前
父节点
当前提交
d27c41fcbb
共有 22 个文件被更改,包括 1179 次插入555 次删除
  1. 36 27
      src/main/java/com/diagbot/entity/MedAdmissionNote.java
  2. 30 20
      src/main/java/com/diagbot/entity/MedBloodResult.java
  3. 36 26
      src/main/java/com/diagbot/entity/MedBloodTransfusion.java
  4. 39 29
      src/main/java/com/diagbot/entity/MedConsultationApply.java
  5. 45 35
      src/main/java/com/diagbot/entity/MedConsultationNote.java
  6. 39 29
      src/main/java/com/diagbot/entity/MedConsultationResult.java
  7. 33 24
      src/main/java/com/diagbot/entity/MedCrisisNote.java
  8. 280 21
      src/main/java/com/diagbot/entity/MedDeathDiscussion.java
  9. 36 26
      src/main/java/com/diagbot/entity/MedDeathNote.java
  10. 36 26
      src/main/java/com/diagbot/entity/MedDifficultCase.java
  11. 30 20
      src/main/java/com/diagbot/entity/MedFirstRecord.java
  12. 75 26
      src/main/java/com/diagbot/entity/MedIllCritically.java
  13. 75 26
      src/main/java/com/diagbot/entity/MedIllSeriousl.java
  14. 36 26
      src/main/java/com/diagbot/entity/MedLeaveHospital.java
  15. 117 29
      src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java
  16. 39 29
      src/main/java/com/diagbot/entity/MedOperativeNote.java
  17. 30 20
      src/main/java/com/diagbot/entity/MedPeriodConclusion.java
  18. 33 23
      src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java
  19. 36 26
      src/main/java/com/diagbot/entity/MedRescueNote.java
  20. 33 23
      src/main/java/com/diagbot/entity/MedTransferInNote.java
  21. 33 22
      src/main/java/com/diagbot/entity/MedTransferOutNote.java
  22. 32 22
      src/main/java/com/diagbot/entity/MedWardRecord.java

+ 36 - 27
src/main/java/com/diagbot/entity/MedAdmissionNote.java

@@ -1,10 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -12,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_admission_note")
 public class MedAdmissionNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -62,12 +58,17 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 出生日期
      */
-    private Date birthday;
+    private LocalDateTime birthday;
 
     /**
      * 婚姻状况
@@ -122,7 +123,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
 
     /**
      * 病史陈述者
@@ -227,7 +228,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -237,7 +238,7 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 体温
@@ -297,12 +298,12 @@ public class MedAdmissionNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -370,18 +371,25 @@ public class MedAdmissionNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBirthday() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getBirthday() {
         return birthday;
     }
 
-    public void setBirthday(Date birthday) {
+    public void setBirthday(LocalDateTime birthday) {
         this.birthday = birthday;
     }
     public String getMarriage() {
@@ -454,11 +462,11 @@ public class MedAdmissionNote implements Serializable {
     public void setPregnantNum(String pregnantNum) {
         this.pregnantNum = pregnantNum;
     }
-    public Date getBehospitalDate() {
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
     public String getHistoryTeller() {
@@ -601,11 +609,11 @@ public class MedAdmissionNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -615,11 +623,11 @@ public class MedAdmissionNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getTemperature() {
@@ -699,18 +707,18 @@ public class MedAdmissionNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -740,6 +748,7 @@ public class MedAdmissionNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", birthday=" + birthday +
             ", marriage=" + marriage +
             ", jobType=" + jobType +

+ 30 - 20
src/main/java/com/diagbot/entity/MedBloodResult.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_blood_result")
 public class MedBloodResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,7 +58,12 @@ public class MedBloodResult implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 效果评价
@@ -76,7 +78,7 @@ public class MedBloodResult implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -86,7 +88,7 @@ public class MedBloodResult implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -106,12 +108,12 @@ public class MedBloodResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -179,13 +181,20 @@ public class MedBloodResult implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getTransfusionEvaluate() {
         return transfusionEvaluate;
     }
@@ -200,11 +209,11 @@ public class MedBloodResult implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -214,11 +223,11 @@ public class MedBloodResult implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -242,18 +251,18 @@ public class MedBloodResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -283,6 +292,7 @@ public class MedBloodResult implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transfusionEvaluate=" + transfusionEvaluate +
             ", recDoctor=" + recDoctor +
             ", recDate=" + recDate +

+ 36 - 26
src/main/java/com/diagbot/entity/MedBloodTransfusion.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_blood_transfusion")
 public class MedBloodTransfusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,17 +58,22 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 开始时间
      */
-    private Date startTime;
+    private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
-    private Date endTime;
+    private LocalDateTime endTime;
 
     /**
      * 输血原因
@@ -96,7 +98,7 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -106,7 +108,7 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -126,12 +128,12 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -199,25 +201,32 @@ public class MedBloodTransfusion implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getStartTime() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(LocalDateTime startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime() {
+    public LocalDateTime getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
     public String getTransfusionReason() {
@@ -248,11 +257,11 @@ public class MedBloodTransfusion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -262,11 +271,11 @@ public class MedBloodTransfusion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -290,18 +299,18 @@ public class MedBloodTransfusion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -331,6 +340,7 @@ public class MedBloodTransfusion implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", transfusionReason=" + transfusionReason +

+ 39 - 29
src/main/java/com/diagbot/entity/MedConsultationApply.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_apply")
 public class MedConsultationApply implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,12 +58,17 @@ public class MedConsultationApply implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
 
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 申请科室
@@ -81,7 +83,7 @@ public class MedConsultationApply implements Serializable {
     /**
      * 申请日期
      */
-    private Date applyDate;
+    private LocalDateTime applyDate;
 
     /**
      * 会诊类别
@@ -116,7 +118,7 @@ public class MedConsultationApply implements Serializable {
     /**
      * 会诊时间
      */
-    private Date consultationDate;
+    private LocalDateTime consultationDate;
 
     /**
      * 会诊目的
@@ -136,7 +138,7 @@ public class MedConsultationApply implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -146,7 +148,7 @@ public class MedConsultationApply implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -166,12 +168,12 @@ public class MedConsultationApply implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -239,20 +241,27 @@ public class MedConsultationApply implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBehospitalDate() {
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getApplyDept() {
         return applyDept;
     }
@@ -267,11 +276,11 @@ public class MedConsultationApply implements Serializable {
     public void setApplyDoctor(String applyDoctor) {
         this.applyDoctor = applyDoctor;
     }
-    public Date getApplyDate() {
+    public LocalDateTime getApplyDate() {
         return applyDate;
     }
 
-    public void setApplyDate(Date applyDate) {
+    public void setApplyDate(LocalDateTime applyDate) {
         this.applyDate = applyDate;
     }
     public String getInviteType() {
@@ -316,11 +325,11 @@ public class MedConsultationApply implements Serializable {
     public void setTreatmentSituation(String treatmentSituation) {
         this.treatmentSituation = treatmentSituation;
     }
-    public Date getConsultationDate() {
+    public LocalDateTime getConsultationDate() {
         return consultationDate;
     }
 
-    public void setConsultationDate(Date consultationDate) {
+    public void setConsultationDate(LocalDateTime consultationDate) {
         this.consultationDate = consultationDate;
     }
     public String getConsultationPurpose() {
@@ -344,11 +353,11 @@ public class MedConsultationApply implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -358,11 +367,11 @@ public class MedConsultationApply implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -386,18 +395,18 @@ public class MedConsultationApply implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -428,6 +437,7 @@ public class MedConsultationApply implements Serializable {
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
             ", behospitalDate=" + behospitalDate +
+            ", recTitle=" + recTitle +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +
             ", applyDate=" + applyDate +

+ 45 - 35
src/main/java/com/diagbot/entity/MedConsultationNote.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_note")
 public class MedConsultationNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,12 +58,17 @@ public class MedConsultationNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
 
     /**
      * 申请科室
@@ -81,7 +83,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 申请日期
      */
-    private Date applyDate;
+    private LocalDateTime applyDate;
 
     /**
      * 会诊类别
@@ -106,7 +108,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 诊疗情况
@@ -116,7 +118,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 会诊时间
      */
-    private Date consultationDate;
+    private LocalDateTime consultationDate;
 
     /**
      * 会诊目的
@@ -136,7 +138,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -146,7 +148,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -166,12 +168,12 @@ public class MedConsultationNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -239,18 +241,25 @@ public class MedConsultationNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBehospitalDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
     public String getApplyDept() {
@@ -267,11 +276,11 @@ public class MedConsultationNote implements Serializable {
     public void setApplyDoctor(String applyDoctor) {
         this.applyDoctor = applyDoctor;
     }
-    public Date getApplyDate() {
+    public LocalDateTime getApplyDate() {
         return applyDate;
     }
 
-    public void setApplyDate(Date applyDate) {
+    public void setApplyDate(LocalDateTime applyDate) {
         this.applyDate = applyDate;
     }
     public String getInviteType() {
@@ -302,12 +311,12 @@ public class MedConsultationNote implements Serializable {
     public void setBriefNote(String briefNote) {
         this.briefNote = briefNote;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getTreatmentSituation() {
         return treatmentSituation;
@@ -316,11 +325,11 @@ public class MedConsultationNote implements Serializable {
     public void setTreatmentSituation(String treatmentSituation) {
         this.treatmentSituation = treatmentSituation;
     }
-    public Date getConsultationDate() {
+    public LocalDateTime getConsultationDate() {
         return consultationDate;
     }
 
-    public void setConsultationDate(Date consultationDate) {
+    public void setConsultationDate(LocalDateTime consultationDate) {
         this.consultationDate = consultationDate;
     }
     public String getConsultationPurpose() {
@@ -344,11 +353,11 @@ public class MedConsultationNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -358,11 +367,11 @@ public class MedConsultationNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -386,18 +395,18 @@ public class MedConsultationNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -427,6 +436,7 @@ public class MedConsultationNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +
@@ -435,7 +445,7 @@ public class MedConsultationNote implements Serializable {
             ", inviteDept=" + inviteDept +
             ", inviteDoctor=" + inviteDoctor +
             ", briefNote=" + briefNote +
-            ", diagnosis=" + diagnosis +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", treatmentSituation=" + treatmentSituation +
             ", consultationDate=" + consultationDate +
             ", consultationPurpose=" + consultationPurpose +

+ 39 - 29
src/main/java/com/diagbot/entity/MedConsultationResult.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_consultation_result")
 public class MedConsultationResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,12 +58,17 @@ public class MedConsultationResult implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
 
     /**
      * 申请科室
@@ -81,7 +83,7 @@ public class MedConsultationResult implements Serializable {
     /**
      * 申请日期
      */
-    private Date applyDate;
+    private LocalDateTime applyDate;
 
     /**
      * 会诊类别
@@ -116,7 +118,7 @@ public class MedConsultationResult implements Serializable {
     /**
      * 会诊到达时间
      */
-    private Date consultationArriveDate;
+    private LocalDateTime consultationArriveDate;
 
     /**
      * 记录医生
@@ -126,7 +128,7 @@ public class MedConsultationResult implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -136,7 +138,7 @@ public class MedConsultationResult implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -156,12 +158,12 @@ public class MedConsultationResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -229,18 +231,25 @@ public class MedConsultationResult implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBehospitalDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
     public String getApplyDept() {
@@ -257,11 +266,11 @@ public class MedConsultationResult implements Serializable {
     public void setApplyDoctor(String applyDoctor) {
         this.applyDoctor = applyDoctor;
     }
-    public Date getApplyDate() {
+    public LocalDateTime getApplyDate() {
         return applyDate;
     }
 
-    public void setApplyDate(Date applyDate) {
+    public void setApplyDate(LocalDateTime applyDate) {
         this.applyDate = applyDate;
     }
     public String getInviteType() {
@@ -306,11 +315,11 @@ public class MedConsultationResult implements Serializable {
     public void setConsultationOpinions(String consultationOpinions) {
         this.consultationOpinions = consultationOpinions;
     }
-    public Date getConsultationArriveDate() {
+    public LocalDateTime getConsultationArriveDate() {
         return consultationArriveDate;
     }
 
-    public void setConsultationArriveDate(Date consultationArriveDate) {
+    public void setConsultationArriveDate(LocalDateTime consultationArriveDate) {
         this.consultationArriveDate = consultationArriveDate;
     }
     public String getRecDoctor() {
@@ -320,11 +329,11 @@ public class MedConsultationResult implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -334,11 +343,11 @@ public class MedConsultationResult implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -362,18 +371,18 @@ public class MedConsultationResult implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -403,6 +412,7 @@ public class MedConsultationResult implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", applyDept=" + applyDept +
             ", applyDoctor=" + applyDoctor +

+ 33 - 24
src/main/java/com/diagbot/entity/MedCrisisNote.java

@@ -1,10 +1,7 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -12,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_crisis_note")
 public class MedCrisisNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -62,7 +58,12 @@ public class MedCrisisNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 危急值报告
@@ -77,7 +78,7 @@ public class MedCrisisNote implements Serializable {
     /**
      * 接收时间
      */
-    private Date recieveDate;
+    private LocalDateTime recieveDate;
 
     /**
      * 记录医生
@@ -87,7 +88,7 @@ public class MedCrisisNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -97,7 +98,7 @@ public class MedCrisisNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -117,12 +118,12 @@ public class MedCrisisNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -190,13 +191,20 @@ public class MedCrisisNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getCrisisNote() {
         return crisisNote;
     }
@@ -211,11 +219,11 @@ public class MedCrisisNote implements Serializable {
     public void setBriefNote(String briefNote) {
         this.briefNote = briefNote;
     }
-    public Date getRecieveDate() {
+    public LocalDateTime getRecieveDate() {
         return recieveDate;
     }
 
-    public void setRecieveDate(Date recieveDate) {
+    public void setRecieveDate(LocalDateTime recieveDate) {
         this.recieveDate = recieveDate;
     }
     public String getRecDoctor() {
@@ -225,11 +233,11 @@ public class MedCrisisNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -239,11 +247,11 @@ public class MedCrisisNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -267,18 +275,18 @@ public class MedCrisisNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -308,6 +316,7 @@ public class MedCrisisNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", crisisNote=" + crisisNote +
             ", briefNote=" + briefNote +
             ", recieveDate=" + recieveDate +

+ 280 - 21
src/main/java/com/diagbot/entity/MedDeathDiscussion.java

@@ -1,9 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -12,10 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_death_discussion")
-@Data
 public class MedDeathDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -59,24 +54,26 @@ public class MedDeathDiscussion implements Serializable {
      * 科别
      */
     private String deptName;
-    //新增
 
     /**
-     * 入院诊断
+     * 病历日期
      */
-    private String tentativeDiagnosis;
+    private LocalDateTime recordDate;
 
     /**
-     * 死亡诊断
+     * 标题
      */
-    private String deathDiagnosis;
+    private String recTitle;
 
-  //还没新增完
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
 
     /**
-     * 病历日期
+     * 死亡诊断
      */
-    private Date recordDate;
+    private String deathDiagnosis;
 
     /**
      * 死亡原因
@@ -86,12 +83,12 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 死亡时间
      */
-    private Date deathDate;
+    private LocalDateTime deathDate;
 
     /**
      * 讨论时间
      */
-    private Date discussDate;
+    private LocalDateTime discussDate;
 
     /**
      * 讨论地点
@@ -131,7 +128,7 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -141,7 +138,7 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -161,12 +158,12 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -178,4 +175,266 @@ public class MedDeathDiscussion implements Serializable {
      */
     private String modifier;
 
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public LocalDateTime getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(LocalDateTime recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getDeathDiagnosis() {
+        return deathDiagnosis;
+    }
+
+    public void setDeathDiagnosis(String deathDiagnosis) {
+        this.deathDiagnosis = deathDiagnosis;
+    }
+    public String getDeathReason() {
+        return deathReason;
+    }
+
+    public void setDeathReason(String deathReason) {
+        this.deathReason = deathReason;
+    }
+    public LocalDateTime getDeathDate() {
+        return deathDate;
+    }
+
+    public void setDeathDate(LocalDateTime deathDate) {
+        this.deathDate = deathDate;
+    }
+    public LocalDateTime getDiscussDate() {
+        return discussDate;
+    }
+
+    public void setDiscussDate(LocalDateTime discussDate) {
+        this.discussDate = discussDate;
+    }
+    public String getDiscussPlace() {
+        return discussPlace;
+    }
+
+    public void setDiscussPlace(String discussPlace) {
+        this.discussPlace = discussPlace;
+    }
+    public String getAnchor() {
+        return anchor;
+    }
+
+    public void setAnchor(String anchor) {
+        this.anchor = anchor;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefHistory() {
+        return briefHistory;
+    }
+
+    public void setBriefHistory(String briefHistory) {
+        this.briefHistory = briefHistory;
+    }
+    public String getDiscussionContent() {
+        return discussionContent;
+    }
+
+    public void setDiscussionContent(String discussionContent) {
+        this.discussionContent = discussionContent;
+    }
+    public String getAnchorConclusion() {
+        return anchorConclusion;
+    }
+
+    public void setAnchorConclusion(String anchorConclusion) {
+        this.anchorConclusion = anchorConclusion;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public LocalDateTime getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(LocalDateTime recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public LocalDateTime getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(LocalDateTime auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedDeathDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", deathReason=" + deathReason +
+            ", deathDate=" + deathDate +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchor=" + anchor +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussionContent=" + discussionContent +
+            ", anchorConclusion=" + anchorConclusion +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
 }

+ 36 - 26
src/main/java/com/diagbot/entity/MedDeathNote.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_death_note")
 public class MedDeathNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,17 +58,22 @@ public class MedDeathNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
 
     /**
      * 死亡日期
      */
-    private Date deathDate;
+    private LocalDateTime deathDate;
 
     /**
      * 入院情况
@@ -106,7 +108,7 @@ public class MedDeathNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -116,7 +118,7 @@ public class MedDeathNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -136,12 +138,12 @@ public class MedDeathNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -209,25 +211,32 @@ public class MedDeathNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBehospitalDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
-    public Date getDeathDate() {
+    public LocalDateTime getDeathDate() {
         return deathDate;
     }
 
-    public void setDeathDate(Date deathDate) {
+    public void setDeathDate(LocalDateTime deathDate) {
         this.deathDate = deathDate;
     }
     public String getBehospitalSituation() {
@@ -272,11 +281,11 @@ public class MedDeathNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -286,11 +295,11 @@ public class MedDeathNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -314,18 +323,18 @@ public class MedDeathNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -355,6 +364,7 @@ public class MedDeathNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", deathDate=" + deathDate +
             ", behospitalSituation=" + behospitalSituation +

+ 36 - 26
src/main/java/com/diagbot/entity/MedDifficultCase.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_difficult_case")
 public class MedDifficultCase implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,17 +58,22 @@ public class MedDifficultCase implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 讨论日期
      */
-    private Date discussDate;
+    private LocalDateTime discussDate;
 
     /**
      * 讨论地点
      */
-    private Date discussPlace;
+    private String discussPlace;
 
     /**
      * 主持人姓名及专业技术职务
@@ -111,7 +113,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -121,7 +123,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -141,12 +143,12 @@ public class MedDifficultCase implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -214,25 +216,32 @@ public class MedDifficultCase implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getDiscussDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getDiscussDate() {
         return discussDate;
     }
 
-    public void setDiscussDate(Date discussDate) {
+    public void setDiscussDate(LocalDateTime discussDate) {
         this.discussDate = discussDate;
     }
-    public Date getDiscussPlace() {
+    public String getDiscussPlace() {
         return discussPlace;
     }
 
-    public void setDiscussPlace(Date discussPlace) {
+    public void setDiscussPlace(String discussPlace) {
         this.discussPlace = discussPlace;
     }
     public String getAnchorMan() {
@@ -284,11 +293,11 @@ public class MedDifficultCase implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -298,11 +307,11 @@ public class MedDifficultCase implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -326,18 +335,18 @@ public class MedDifficultCase implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -367,6 +376,7 @@ public class MedDifficultCase implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", discussDate=" + discussDate +
             ", discussPlace=" + discussPlace +
             ", anchorMan=" + anchorMan +

+ 30 - 20
src/main/java/com/diagbot/entity/MedFirstRecord.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_first_record")
 public class MedFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,7 +58,12 @@ public class MedFirstRecord implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 主诉
@@ -121,7 +123,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -131,7 +133,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -151,12 +153,12 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -224,13 +226,20 @@ public class MedFirstRecord implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getChief() {
         return chief;
     }
@@ -308,11 +317,11 @@ public class MedFirstRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -322,11 +331,11 @@ public class MedFirstRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -350,18 +359,18 @@ public class MedFirstRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -391,6 +400,7 @@ public class MedFirstRecord implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", chief=" + chief +
             ", present=" + present +
             ", pastHistory=" + pastHistory +

+ 75 - 26
src/main/java/com/diagbot/entity/MedIllCritically.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ill_critically")
 public class MedIllCritically implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,15 +40,35 @@ public class MedIllCritically implements Serializable {
      */
     private String sex;
 
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 病情危重情况
@@ -66,7 +83,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 患者签名时间
      */
-    private Date patientSignDate;
+    private LocalDateTime patientSignDate;
 
     /**
      * 医生签名
@@ -76,7 +93,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 医生签名时间
      */
-    private Date doctorSignDate;
+    private LocalDateTime doctorSignDate;
 
     /**
      * 结构化数据
@@ -96,12 +113,12 @@ public class MedIllCritically implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -148,19 +165,47 @@ public class MedIllCritically implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public Date getRecordDate() {
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getCriticalSituation() {
         return criticalSituation;
@@ -176,11 +221,11 @@ public class MedIllCritically implements Serializable {
     public void setPatientSign(String patientSign) {
         this.patientSign = patientSign;
     }
-    public Date getPatientSignDate() {
+    public LocalDateTime getPatientSignDate() {
         return patientSignDate;
     }
 
-    public void setPatientSignDate(Date patientSignDate) {
+    public void setPatientSignDate(LocalDateTime patientSignDate) {
         this.patientSignDate = patientSignDate;
     }
     public String getDoctorSign() {
@@ -190,11 +235,11 @@ public class MedIllCritically implements Serializable {
     public void setDoctorSign(String doctorSign) {
         this.doctorSign = doctorSign;
     }
-    public Date getDoctorSignDate() {
+    public LocalDateTime getDoctorSignDate() {
         return doctorSignDate;
     }
 
-    public void setDoctorSignDate(Date doctorSignDate) {
+    public void setDoctorSignDate(LocalDateTime doctorSignDate) {
         this.doctorSignDate = doctorSignDate;
     }
     public String getWholeData() {
@@ -218,18 +263,18 @@ public class MedIllCritically implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -255,8 +300,12 @@ public class MedIllCritically implements Serializable {
             ", behospitalCode=" + behospitalCode +
             ", name=" + name +
             ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
             ", recordDate=" + recordDate +
-            ", diagnosis=" + diagnosis +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", criticalSituation=" + criticalSituation +
             ", patientSign=" + patientSign +
             ", patientSignDate=" + patientSignDate +

+ 75 - 26
src/main/java/com/diagbot/entity/MedIllSeriousl.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ill_seriousl")
 public class MedIllSeriousl implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,15 +40,35 @@ public class MedIllSeriousl implements Serializable {
      */
     private String sex;
 
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 当前诊断
      */
-    private String diagnosis;
+    private String currentDiagnosis;
 
     /**
      * 病情危重情况
@@ -66,7 +83,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 患者签名时间
      */
-    private Date patientSignDate;
+    private LocalDateTime patientSignDate;
 
     /**
      * 医生签名
@@ -76,7 +93,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 医生签名时间
      */
-    private Date doctorSignDate;
+    private LocalDateTime doctorSignDate;
 
     /**
      * 结构化数据
@@ -96,12 +113,12 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -148,19 +165,47 @@ public class MedIllSeriousl implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public Date getRecordDate() {
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public String getDiagnosis() {
-        return diagnosis;
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
     }
     public String getCriticalSituation() {
         return criticalSituation;
@@ -176,11 +221,11 @@ public class MedIllSeriousl implements Serializable {
     public void setPatientSign(String patientSign) {
         this.patientSign = patientSign;
     }
-    public Date getPatientSignDate() {
+    public LocalDateTime getPatientSignDate() {
         return patientSignDate;
     }
 
-    public void setPatientSignDate(Date patientSignDate) {
+    public void setPatientSignDate(LocalDateTime patientSignDate) {
         this.patientSignDate = patientSignDate;
     }
     public String getDoctorSign() {
@@ -190,11 +235,11 @@ public class MedIllSeriousl implements Serializable {
     public void setDoctorSign(String doctorSign) {
         this.doctorSign = doctorSign;
     }
-    public Date getDoctorSignDate() {
+    public LocalDateTime getDoctorSignDate() {
         return doctorSignDate;
     }
 
-    public void setDoctorSignDate(Date doctorSignDate) {
+    public void setDoctorSignDate(LocalDateTime doctorSignDate) {
         this.doctorSignDate = doctorSignDate;
     }
     public String getWholeData() {
@@ -218,18 +263,18 @@ public class MedIllSeriousl implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -255,8 +300,12 @@ public class MedIllSeriousl implements Serializable {
             ", behospitalCode=" + behospitalCode +
             ", name=" + name +
             ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
             ", recordDate=" + recordDate +
-            ", diagnosis=" + diagnosis +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
             ", criticalSituation=" + criticalSituation +
             ", patientSign=" + patientSign +
             ", patientSignDate=" + patientSignDate +

+ 36 - 26
src/main/java/com/diagbot/entity/MedLeaveHospital.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_leave_hospital")
 public class MedLeaveHospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,17 +58,22 @@ public class MedLeaveHospital implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 入院日期
      */
-    private Date behospitalDate;
+    private LocalDateTime behospitalDate;
 
     /**
      * 出院日期
      */
-    private Date leaveHospitalDate;
+    private LocalDateTime leaveHospitalDate;
 
     /**
      * 入院诊断
@@ -121,7 +123,7 @@ public class MedLeaveHospital implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -131,7 +133,7 @@ public class MedLeaveHospital implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -151,12 +153,12 @@ public class MedLeaveHospital implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -224,25 +226,32 @@ public class MedLeaveHospital implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getBehospitalDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(Date behospitalDate) {
+    public void setBehospitalDate(LocalDateTime behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
-    public Date getLeaveHospitalDate() {
+    public LocalDateTime getLeaveHospitalDate() {
         return leaveHospitalDate;
     }
 
-    public void setLeaveHospitalDate(Date leaveHospitalDate) {
+    public void setLeaveHospitalDate(LocalDateTime leaveHospitalDate) {
         this.leaveHospitalDate = leaveHospitalDate;
     }
     public String getTentativeDiagnosis() {
@@ -308,11 +317,11 @@ public class MedLeaveHospital implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -322,11 +331,11 @@ public class MedLeaveHospital implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -350,18 +359,18 @@ public class MedLeaveHospital implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -391,6 +400,7 @@ public class MedLeaveHospital implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", behospitalDate=" + behospitalDate +
             ", leaveHospitalDate=" + leaveHospitalDate +
             ", tentativeDiagnosis=" + tentativeDiagnosis +

+ 117 - 29
src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_operative_first_record")
 public class MedOperativeFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,28 +58,38 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 手术日期
      */
-    private Date operationDate;
+    private LocalDateTime operationDate;
 
     /**
      * 开始时间
      */
-    private Date startTime;
+    private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
-    private Date endTime;
+    private LocalDateTime endTime;
 
     /**
      * 麻醉方式
      */
     private String narcosisType;
 
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
     /**
      * 术前诊断
      */
@@ -93,6 +100,11 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private String postoperativeDiagnosis;
 
+    /**
+     * 手术人员
+     */
+    private String operationMan;
+
     /**
      * 手术名称方式
      */
@@ -123,6 +135,26 @@ public class MedOperativeFirstRecord implements Serializable {
      */
     private String postoperativeComplication;
 
+    /**
+     * 手术切除标本
+     */
+    private String operationSpecimen;
+
+    /**
+     * 术中出血量
+     */
+    private String operationBleed;
+
+    /**
+     * 术中输血量
+     */
+    private String operationBloodTransfusion;
+
+    /**
+     * 术中并发症
+     */
+    private String operationComplication;
+
     /**
      * 记录医生
      */
@@ -131,7 +163,7 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -141,7 +173,7 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -161,12 +193,12 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -234,32 +266,39 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getOperationDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getOperationDate() {
         return operationDate;
     }
 
-    public void setOperationDate(Date operationDate) {
+    public void setOperationDate(LocalDateTime operationDate) {
         this.operationDate = operationDate;
     }
-    public Date getStartTime() {
+    public LocalDateTime getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(LocalDateTime startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime() {
+    public LocalDateTime getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
     public String getNarcosisType() {
@@ -269,6 +308,13 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setNarcosisType(String narcosisType) {
         this.narcosisType = narcosisType;
     }
+    public String getNarcosisDoctor() {
+        return narcosisDoctor;
+    }
+
+    public void setNarcosisDoctor(String narcosisDoctor) {
+        this.narcosisDoctor = narcosisDoctor;
+    }
     public String getPreoperationDiagnosis() {
         return preoperationDiagnosis;
     }
@@ -283,6 +329,13 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
         this.postoperativeDiagnosis = postoperativeDiagnosis;
     }
+    public String getOperationMan() {
+        return operationMan;
+    }
+
+    public void setOperationMan(String operationMan) {
+        this.operationMan = operationMan;
+    }
     public String getOperationName() {
         return operationName;
     }
@@ -325,6 +378,34 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setPostoperativeComplication(String postoperativeComplication) {
         this.postoperativeComplication = postoperativeComplication;
     }
+    public String getOperationSpecimen() {
+        return operationSpecimen;
+    }
+
+    public void setOperationSpecimen(String operationSpecimen) {
+        this.operationSpecimen = operationSpecimen;
+    }
+    public String getOperationBleed() {
+        return operationBleed;
+    }
+
+    public void setOperationBleed(String operationBleed) {
+        this.operationBleed = operationBleed;
+    }
+    public String getOperationBloodTransfusion() {
+        return operationBloodTransfusion;
+    }
+
+    public void setOperationBloodTransfusion(String operationBloodTransfusion) {
+        this.operationBloodTransfusion = operationBloodTransfusion;
+    }
+    public String getOperationComplication() {
+        return operationComplication;
+    }
+
+    public void setOperationComplication(String operationComplication) {
+        this.operationComplication = operationComplication;
+    }
     public String getRecDoctor() {
         return recDoctor;
     }
@@ -332,11 +413,11 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -346,11 +427,11 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -374,18 +455,18 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -415,18 +496,25 @@ public class MedOperativeFirstRecord implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", operationDate=" + operationDate +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", narcosisType=" + narcosisType +
+            ", narcosisDoctor=" + narcosisDoctor +
             ", preoperationDiagnosis=" + preoperationDiagnosis +
             ", postoperativeDiagnosis=" + postoperativeDiagnosis +
+            ", operationMan=" + operationMan +
             ", operationName=" + operationName +
             ", operationProcess=" + operationProcess +
             ", postoperativeSituation=" + postoperativeSituation +
             ", postoperativeTreatment=" + postoperativeTreatment +
             ", postoperativeNotice=" + postoperativeNotice +
             ", postoperativeComplication=" + postoperativeComplication +
+            ", operationSpecimen=" + operationSpecimen +
+            ", operationBleed=" + operationBleed +
+            ", operationBloodTransfusion=" + operationBloodTransfusion +
+            ", operationComplication=" + operationComplication +
             ", recDoctor=" + recDoctor +
             ", recDate=" + recDate +
             ", auditDoctor=" + auditDoctor +

+ 39 - 29
src/main/java/com/diagbot/entity/MedOperativeNote.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_operative_note")
 public class MedOperativeNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,22 +58,27 @@ public class MedOperativeNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 手术日期
      */
-    private Date operationDate;
+    private LocalDateTime operationDate;
 
     /**
      * 开始时间
      */
-    private Date startTime;
+    private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
-    private Date endTime;
+    private LocalDateTime endTime;
 
     /**
      * 术前诊断
@@ -166,7 +168,7 @@ public class MedOperativeNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -176,7 +178,7 @@ public class MedOperativeNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -196,12 +198,12 @@ public class MedOperativeNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -269,32 +271,39 @@ public class MedOperativeNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getOperationDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getOperationDate() {
         return operationDate;
     }
 
-    public void setOperationDate(Date operationDate) {
+    public void setOperationDate(LocalDateTime operationDate) {
         this.operationDate = operationDate;
     }
-    public Date getStartTime() {
+    public LocalDateTime getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(LocalDateTime startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime() {
+    public LocalDateTime getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
     public String getPreoperationDiagnosis() {
@@ -416,11 +425,11 @@ public class MedOperativeNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -430,11 +439,11 @@ public class MedOperativeNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -458,18 +467,18 @@ public class MedOperativeNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -499,6 +508,7 @@ public class MedOperativeNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", operationDate=" + operationDate +
             ", startTime=" + startTime +
             ", endTime=" + endTime +

+ 30 - 20
src/main/java/com/diagbot/entity/MedPeriodConclusion.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_period_conclusion")
 public class MedPeriodConclusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,7 +58,12 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 参加人员
@@ -111,7 +113,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -121,7 +123,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -141,12 +143,12 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -214,13 +216,20 @@ public class MedPeriodConclusion implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
     public String getParticipant() {
         return participant;
     }
@@ -284,11 +293,11 @@ public class MedPeriodConclusion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -298,11 +307,11 @@ public class MedPeriodConclusion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -326,18 +335,18 @@ public class MedPeriodConclusion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -367,6 +376,7 @@ public class MedPeriodConclusion implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", participant=" + participant +
             ", chief=" + chief +
             ", behospitalSituation=" + behospitalSituation +

+ 33 - 23
src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_preoperative_discussion")
 public class MedPreoperativeDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,12 +58,17 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 讨论时间
      */
-    private Date discussTime;
+    private LocalDateTime discussTime;
 
     /**
      * 讨论方式
@@ -136,7 +138,7 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -146,7 +148,7 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -166,12 +168,12 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -239,18 +241,25 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getDiscussTime() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getDiscussTime() {
         return discussTime;
     }
 
-    public void setDiscussTime(Date discussTime) {
+    public void setDiscussTime(LocalDateTime discussTime) {
         this.discussTime = discussTime;
     }
     public String getDiscussType() {
@@ -344,11 +353,11 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -358,11 +367,11 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -386,18 +395,18 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -427,6 +436,7 @@ public class MedPreoperativeDiscussion implements Serializable {
             ", deptName=" + deptName +
             ", sex=" + sex +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", discussTime=" + discussTime +
             ", discussType=" + discussType +
             ", participant=" + participant +

+ 36 - 26
src/main/java/com/diagbot/entity/MedRescueNote.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_rescue_note")
 public class MedRescueNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,17 +58,22 @@ public class MedRescueNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 开始时间
      */
-    private Date startTime;
+    private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
-    private Date endTime;
+    private LocalDateTime endTime;
 
     /**
      * 简要病情
@@ -96,7 +98,7 @@ public class MedRescueNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -106,7 +108,7 @@ public class MedRescueNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -126,12 +128,12 @@ public class MedRescueNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -199,25 +201,32 @@ public class MedRescueNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getStartTime() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(LocalDateTime startTime) {
         this.startTime = startTime;
     }
-    public Date getEndTime() {
+    public LocalDateTime getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
     public String getBriefNote() {
@@ -248,11 +257,11 @@ public class MedRescueNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -262,11 +271,11 @@ public class MedRescueNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -290,18 +299,18 @@ public class MedRescueNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -331,6 +340,7 @@ public class MedRescueNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", startTime=" + startTime +
             ", endTime=" + endTime +
             ", briefNote=" + briefNote +

+ 33 - 23
src/main/java/com/diagbot/entity/MedTransferInNote.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_transfer_in_note")
 public class MedTransferInNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,12 +58,17 @@ public class MedTransferInNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 转入日期
      */
-    private Date transferInDate;
+    private LocalDateTime transferInDate;
 
     /**
      * 转出科室
@@ -121,7 +123,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -131,7 +133,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -151,12 +153,12 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -224,18 +226,25 @@ public class MedTransferInNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getTransferInDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(Date transferInDate) {
+    public void setTransferInDate(LocalDateTime transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -308,11 +317,11 @@ public class MedTransferInNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -322,11 +331,11 @@ public class MedTransferInNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -350,18 +359,18 @@ public class MedTransferInNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -391,6 +400,7 @@ public class MedTransferInNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transferInDate=" + transferInDate +
             ", transferOutDept=" + transferOutDept +
             ", transferInDept=" + transferInDept +

+ 33 - 22
src/main/java/com/diagbot/entity/MedTransferOutNote.java

@@ -1,7 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -10,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_transfer_out_note")
 public class MedTransferOutNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -60,12 +58,17 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
 
     /**
      * 转入日期
      */
-    private Date transferInDate;
+    private LocalDateTime transferInDate;
 
     /**
      * 转出科室
@@ -120,7 +123,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -130,7 +133,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -150,12 +153,12 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -223,18 +226,25 @@ public class MedTransferOutNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
-    public Date getTransferInDate() {
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public LocalDateTime getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(Date transferInDate) {
+    public void setTransferInDate(LocalDateTime transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -307,11 +317,11 @@ public class MedTransferOutNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -321,11 +331,11 @@ public class MedTransferOutNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -349,18 +359,18 @@ public class MedTransferOutNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -390,6 +400,7 @@ public class MedTransferOutNote implements Serializable {
             ", bedNo=" + bedNo +
             ", deptName=" + deptName +
             ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
             ", transferInDate=" + transferInDate +
             ", transferOutDept=" + transferOutDept +
             ", transferInDept=" + transferInDept +

+ 32 - 22
src/main/java/com/diagbot/entity/MedWardRecord.java

@@ -1,8 +1,6 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 
 /**
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * </p>
  *
  * @author cy
- * @since 2020-09-22
+ * @since 2020-10-09
  */
-@TableName("med_ward_record")
 public class MedWardRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -61,7 +58,12 @@ public class MedWardRecord implements Serializable {
     /**
      * 病历日期
      */
-    private Date recordDate;
+    private LocalDateTime recordDate;
+
+    /**
+     * 查房日期
+     */
+    private LocalDateTime wardDate;
 
     /**
      * 查房医生
@@ -69,12 +71,12 @@ public class MedWardRecord implements Serializable {
     private String wardDoctor;
 
     /**
-     * 查房标题
+     * 标题
      */
     private String wardTitle;
 
     /**
-     * 病历内容
+     * 病情记录
      */
     private String wardContent;
 
@@ -106,7 +108,7 @@ public class MedWardRecord implements Serializable {
     /**
      * 记录时间
      */
-    private Date recDate;
+    private LocalDateTime recDate;
 
     /**
      * 审核医生
@@ -116,7 +118,7 @@ public class MedWardRecord implements Serializable {
     /**
      * 审核时间
      */
-    private Date auditDate;
+    private LocalDateTime auditDate;
 
     /**
      * 结构化数据
@@ -136,12 +138,12 @@ public class MedWardRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人
@@ -209,13 +211,20 @@ public class MedWardRecord implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public Date getRecordDate() {
+    public LocalDateTime getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(Date recordDate) {
+    public void setRecordDate(LocalDateTime recordDate) {
         this.recordDate = recordDate;
     }
+    public LocalDateTime getWardDate() {
+        return wardDate;
+    }
+
+    public void setWardDate(LocalDateTime wardDate) {
+        this.wardDate = wardDate;
+    }
     public String getWardDoctor() {
         return wardDoctor;
     }
@@ -272,11 +281,11 @@ public class MedWardRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public Date getRecDate() {
+    public LocalDateTime getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(Date recDate) {
+    public void setRecDate(LocalDateTime recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -286,11 +295,11 @@ public class MedWardRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public Date getAuditDate() {
+    public LocalDateTime getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(Date auditDate) {
+    public void setAuditDate(LocalDateTime auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -314,18 +323,18 @@ public class MedWardRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public Date getGmtCreate() {
+    public LocalDateTime getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(Date gmtCreate) {
+    public void setGmtCreate(LocalDateTime gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public Date getGmtModified() {
+    public LocalDateTime getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(Date gmtModified) {
+    public void setGmtModified(LocalDateTime gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -355,6 +364,7 @@ public class MedWardRecord implements Serializable {
             ", deptName=" + deptName +
             ", sex=" + sex +
             ", recordDate=" + recordDate +
+            ", wardDate=" + wardDate +
             ", wardDoctor=" + wardDoctor +
             ", wardTitle=" + wardTitle +
             ", wardContent=" + wardContent +