Quellcode durchsuchen

文书查询格式调整

chengyao vor 4 Jahren
Ursprung
Commit
86dc642331
45 geänderte Dateien mit 1250 neuen und 514 gelöschten Zeilen
  1. 26 22
      src/main/java/com/diagbot/entity/MedAdmissionNote.java
  2. 19 16
      src/main/java/com/diagbot/entity/MedBloodResult.java
  3. 25 22
      src/main/java/com/diagbot/entity/MedBloodTransfusion.java
  4. 28 25
      src/main/java/com/diagbot/entity/MedConsultationApply.java
  5. 28 25
      src/main/java/com/diagbot/entity/MedConsultationNote.java
  6. 28 25
      src/main/java/com/diagbot/entity/MedConsultationResult.java
  7. 23 19
      src/main/java/com/diagbot/entity/MedCrisisNote.java
  8. 25 22
      src/main/java/com/diagbot/entity/MedDeathDiscussion.java
  9. 25 22
      src/main/java/com/diagbot/entity/MedDeathNote.java
  10. 25 22
      src/main/java/com/diagbot/entity/MedDifficultCase.java
  11. 19 16
      src/main/java/com/diagbot/entity/MedFirstRecord.java
  12. 19 16
      src/main/java/com/diagbot/entity/MedIllCritically.java
  13. 19 16
      src/main/java/com/diagbot/entity/MedIllSeriousl.java
  14. 25 22
      src/main/java/com/diagbot/entity/MedLeaveHospital.java
  15. 28 25
      src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java
  16. 28 25
      src/main/java/com/diagbot/entity/MedOperativeNote.java
  17. 19 16
      src/main/java/com/diagbot/entity/MedPeriodConclusion.java
  18. 22 19
      src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java
  19. 25 22
      src/main/java/com/diagbot/entity/MedRescueNote.java
  20. 22 19
      src/main/java/com/diagbot/entity/MedTransferInNote.java
  21. 21 19
      src/main/java/com/diagbot/entity/MedTransferOutNote.java
  22. 19 16
      src/main/java/com/diagbot/entity/MedWardRecord.java
  23. 426 63
      src/main/java/com/diagbot/facade/BehospitalInfoFacade.java
  24. 13 0
      src/main/java/com/diagbot/facade/MedAdmissionNoteFacade.java
  25. 13 0
      src/main/java/com/diagbot/facade/MedBloodResultFacade.java
  26. 14 0
      src/main/java/com/diagbot/facade/MedBloodTransfusionFacade.java
  27. 14 0
      src/main/java/com/diagbot/facade/MedConsultationApplyFacade.java
  28. 14 0
      src/main/java/com/diagbot/facade/MedConsultationNoteFacade.java
  29. 14 0
      src/main/java/com/diagbot/facade/MedConsultationResultFacade.java
  30. 14 0
      src/main/java/com/diagbot/facade/MedCrisisNoteFacade.java
  31. 14 0
      src/main/java/com/diagbot/facade/MedDeathDiscussionFacade.java
  32. 14 0
      src/main/java/com/diagbot/facade/MedDeathNoteFacade.java
  33. 14 0
      src/main/java/com/diagbot/facade/MedDifficultCaseFacade.java
  34. 14 0
      src/main/java/com/diagbot/facade/MedFirstRecordFacade.java
  35. 14 0
      src/main/java/com/diagbot/facade/MedIllCriticallyFacade.java
  36. 14 0
      src/main/java/com/diagbot/facade/MedIllSeriouslFacade.java
  37. 14 0
      src/main/java/com/diagbot/facade/MedLeaveHospitalFacade.java
  38. 14 0
      src/main/java/com/diagbot/facade/MedOperativeFirstRecordFacade.java
  39. 14 0
      src/main/java/com/diagbot/facade/MedOperativeNoteFacade.java
  40. 14 0
      src/main/java/com/diagbot/facade/MedPeriodConclusionFacade.java
  41. 14 0
      src/main/java/com/diagbot/facade/MedPreoperativeDiscussionFacade.java
  42. 14 0
      src/main/java/com/diagbot/facade/MedRescueNoteFacade.java
  43. 14 0
      src/main/java/com/diagbot/facade/MedTransferInNoteFacade.java
  44. 14 0
      src/main/java/com/diagbot/facade/MedTransferOutNoteFacade.java
  45. 14 0
      src/main/java/com/diagbot/facade/MedWardRecordFacade.java

+ 26 - 22
src/main/java/com/diagbot/entity/MedAdmissionNote.java

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

+ 19 - 16
src/main/java/com/diagbot/entity/MedBloodResult.java

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

+ 25 - 22
src/main/java/com/diagbot/entity/MedBloodTransfusion.java

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

+ 28 - 25
src/main/java/com/diagbot/entity/MedConsultationApply.java

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

+ 28 - 25
src/main/java/com/diagbot/entity/MedConsultationNote.java

@@ -1,7 +1,9 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_consultation_note")
 public class MedConsultationNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,12 +61,12 @@ public class MedConsultationNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 入院日期
      */
-    private LocalDateTime behospitalDate;
+    private Date behospitalDate;
 
     /**
      * 申请科室
@@ -78,7 +81,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 申请日期
      */
-    private LocalDateTime applyDate;
+    private Date applyDate;
 
     /**
      * 会诊类别
@@ -113,7 +116,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 会诊时间
      */
-    private LocalDateTime consultationDate;
+    private Date consultationDate;
 
     /**
      * 会诊目的
@@ -133,7 +136,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -143,7 +146,7 @@ public class MedConsultationNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -163,12 +166,12 @@ public class MedConsultationNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -236,18 +239,18 @@ public class MedConsultationNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public LocalDateTime getBehospitalDate() {
+    public Date getBehospitalDate() {
         return behospitalDate;
     }
 
-    public void setBehospitalDate(LocalDateTime behospitalDate) {
+    public void setBehospitalDate(Date behospitalDate) {
         this.behospitalDate = behospitalDate;
     }
     public String getApplyDept() {
@@ -264,11 +267,11 @@ public class MedConsultationNote implements Serializable {
     public void setApplyDoctor(String applyDoctor) {
         this.applyDoctor = applyDoctor;
     }
-    public LocalDateTime getApplyDate() {
+    public Date getApplyDate() {
         return applyDate;
     }
 
-    public void setApplyDate(LocalDateTime applyDate) {
+    public void setApplyDate(Date applyDate) {
         this.applyDate = applyDate;
     }
     public String getInviteType() {
@@ -313,11 +316,11 @@ public class MedConsultationNote implements Serializable {
     public void setTreatmentSituation(String treatmentSituation) {
         this.treatmentSituation = treatmentSituation;
     }
-    public LocalDateTime getConsultationDate() {
+    public Date getConsultationDate() {
         return consultationDate;
     }
 
-    public void setConsultationDate(LocalDateTime consultationDate) {
+    public void setConsultationDate(Date consultationDate) {
         this.consultationDate = consultationDate;
     }
     public String getConsultationPurpose() {
@@ -341,11 +344,11 @@ public class MedConsultationNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -355,11 +358,11 @@ public class MedConsultationNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -383,18 +386,18 @@ public class MedConsultationNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 28 - 25
src/main/java/com/diagbot/entity/MedConsultationResult.java

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

+ 23 - 19
src/main/java/com/diagbot/entity/MedCrisisNote.java

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

+ 25 - 22
src/main/java/com/diagbot/entity/MedDeathDiscussion.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_death_discussion")
 public class MedDeathDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,7 +61,7 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 死亡原因
@@ -68,12 +71,12 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 死亡时间
      */
-    private LocalDateTime deathDate;
+    private Date deathDate;
 
     /**
      * 讨论时间
      */
-    private LocalDateTime discussDate;
+    private Date discussDate;
 
     /**
      * 讨论地点
@@ -113,7 +116,7 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -123,7 +126,7 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -143,12 +146,12 @@ public class MedDeathDiscussion implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -216,11 +219,11 @@ public class MedDeathDiscussion implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getDeathReason() {
@@ -230,18 +233,18 @@ public class MedDeathDiscussion implements Serializable {
     public void setDeathReason(String deathReason) {
         this.deathReason = deathReason;
     }
-    public LocalDateTime getDeathDate() {
+    public Date getDeathDate() {
         return deathDate;
     }
 
-    public void setDeathDate(LocalDateTime deathDate) {
+    public void setDeathDate(Date deathDate) {
         this.deathDate = deathDate;
     }
-    public LocalDateTime getDiscussDate() {
+    public Date getDiscussDate() {
         return discussDate;
     }
 
-    public void setDiscussDate(LocalDateTime discussDate) {
+    public void setDiscussDate(Date discussDate) {
         this.discussDate = discussDate;
     }
     public String getDiscussPlace() {
@@ -293,11 +296,11 @@ public class MedDeathDiscussion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -307,11 +310,11 @@ public class MedDeathDiscussion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -335,18 +338,18 @@ public class MedDeathDiscussion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 25 - 22
src/main/java/com/diagbot/entity/MedDeathNote.java

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

+ 25 - 22
src/main/java/com/diagbot/entity/MedDifficultCase.java

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

+ 19 - 16
src/main/java/com/diagbot/entity/MedFirstRecord.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_first_record")
 public class MedFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,7 +61,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 主诉
@@ -118,7 +121,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -128,7 +131,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -148,12 +151,12 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -221,11 +224,11 @@ public class MedFirstRecord implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getChief() {
@@ -305,11 +308,11 @@ public class MedFirstRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -319,11 +322,11 @@ public class MedFirstRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -347,18 +350,18 @@ public class MedFirstRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 19 - 16
src/main/java/com/diagbot/entity/MedIllCritically.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_ill_critically")
 public class MedIllCritically implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,7 +46,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 当前诊断
@@ -63,7 +66,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 患者签名时间
      */
-    private LocalDateTime patientSignDate;
+    private Date patientSignDate;
 
     /**
      * 医生签名
@@ -73,7 +76,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 医生签名时间
      */
-    private LocalDateTime doctorSignDate;
+    private Date doctorSignDate;
 
     /**
      * 结构化数据
@@ -93,12 +96,12 @@ public class MedIllCritically implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -145,11 +148,11 @@ public class MedIllCritically implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getDiagnosis() {
@@ -173,11 +176,11 @@ public class MedIllCritically implements Serializable {
     public void setPatientSign(String patientSign) {
         this.patientSign = patientSign;
     }
-    public LocalDateTime getPatientSignDate() {
+    public Date getPatientSignDate() {
         return patientSignDate;
     }
 
-    public void setPatientSignDate(LocalDateTime patientSignDate) {
+    public void setPatientSignDate(Date patientSignDate) {
         this.patientSignDate = patientSignDate;
     }
     public String getDoctorSign() {
@@ -187,11 +190,11 @@ public class MedIllCritically implements Serializable {
     public void setDoctorSign(String doctorSign) {
         this.doctorSign = doctorSign;
     }
-    public LocalDateTime getDoctorSignDate() {
+    public Date getDoctorSignDate() {
         return doctorSignDate;
     }
 
-    public void setDoctorSignDate(LocalDateTime doctorSignDate) {
+    public void setDoctorSignDate(Date doctorSignDate) {
         this.doctorSignDate = doctorSignDate;
     }
     public String getWholeData() {
@@ -215,18 +218,18 @@ public class MedIllCritically implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 19 - 16
src/main/java/com/diagbot/entity/MedIllSeriousl.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_ill_seriousl")
 public class MedIllSeriousl implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,7 +46,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 当前诊断
@@ -63,7 +66,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 患者签名时间
      */
-    private LocalDateTime patientSignDate;
+    private Date patientSignDate;
 
     /**
      * 医生签名
@@ -73,7 +76,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 医生签名时间
      */
-    private LocalDateTime doctorSignDate;
+    private Date doctorSignDate;
 
     /**
      * 结构化数据
@@ -93,12 +96,12 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -145,11 +148,11 @@ public class MedIllSeriousl implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getDiagnosis() {
@@ -173,11 +176,11 @@ public class MedIllSeriousl implements Serializable {
     public void setPatientSign(String patientSign) {
         this.patientSign = patientSign;
     }
-    public LocalDateTime getPatientSignDate() {
+    public Date getPatientSignDate() {
         return patientSignDate;
     }
 
-    public void setPatientSignDate(LocalDateTime patientSignDate) {
+    public void setPatientSignDate(Date patientSignDate) {
         this.patientSignDate = patientSignDate;
     }
     public String getDoctorSign() {
@@ -187,11 +190,11 @@ public class MedIllSeriousl implements Serializable {
     public void setDoctorSign(String doctorSign) {
         this.doctorSign = doctorSign;
     }
-    public LocalDateTime getDoctorSignDate() {
+    public Date getDoctorSignDate() {
         return doctorSignDate;
     }
 
-    public void setDoctorSignDate(LocalDateTime doctorSignDate) {
+    public void setDoctorSignDate(Date doctorSignDate) {
         this.doctorSignDate = doctorSignDate;
     }
     public String getWholeData() {
@@ -215,18 +218,18 @@ public class MedIllSeriousl implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 25 - 22
src/main/java/com/diagbot/entity/MedLeaveHospital.java

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

+ 28 - 25
src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_operative_first_record")
 public class MedOperativeFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,22 +61,22 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 手术日期
      */
-    private LocalDateTime operationDate;
+    private Date operationDate;
 
     /**
      * 开始时间
      */
-    private LocalDateTime startTime;
+    private Date startTime;
 
     /**
      * 结束时间
      */
-    private LocalDateTime endTime;
+    private Date endTime;
 
     /**
      * 麻醉方式
@@ -128,7 +131,7 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -138,7 +141,7 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -158,12 +161,12 @@ public class MedOperativeFirstRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -231,32 +234,32 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public LocalDateTime getOperationDate() {
+    public Date getOperationDate() {
         return operationDate;
     }
 
-    public void setOperationDate(LocalDateTime operationDate) {
+    public void setOperationDate(Date operationDate) {
         this.operationDate = operationDate;
     }
-    public LocalDateTime getStartTime() {
+    public Date getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(LocalDateTime startTime) {
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
-    public LocalDateTime getEndTime() {
+    public Date getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(LocalDateTime endTime) {
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
     public String getNarcosisType() {
@@ -329,11 +332,11 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -343,11 +346,11 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -371,18 +374,18 @@ public class MedOperativeFirstRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 28 - 25
src/main/java/com/diagbot/entity/MedOperativeNote.java

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

+ 19 - 16
src/main/java/com/diagbot/entity/MedPeriodConclusion.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_period_conclusion")
 public class MedPeriodConclusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,7 +61,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 参加人员
@@ -108,7 +111,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -118,7 +121,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -138,12 +141,12 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -211,11 +214,11 @@ public class MedPeriodConclusion implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getParticipant() {
@@ -281,11 +284,11 @@ public class MedPeriodConclusion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -295,11 +298,11 @@ public class MedPeriodConclusion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -323,18 +326,18 @@ public class MedPeriodConclusion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 22 - 19
src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_preoperative_discussion")
 public class MedPreoperativeDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,12 +61,12 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 讨论时间
      */
-    private LocalDateTime discussTime;
+    private Date discussTime;
 
     /**
      * 讨论方式
@@ -133,7 +136,7 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -143,7 +146,7 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -163,12 +166,12 @@ public class MedPreoperativeDiscussion implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -236,18 +239,18 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public LocalDateTime getDiscussTime() {
+    public Date getDiscussTime() {
         return discussTime;
     }
 
-    public void setDiscussTime(LocalDateTime discussTime) {
+    public void setDiscussTime(Date discussTime) {
         this.discussTime = discussTime;
     }
     public String getDiscussType() {
@@ -341,11 +344,11 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -355,11 +358,11 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -383,18 +386,18 @@ public class MedPreoperativeDiscussion implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 25 - 22
src/main/java/com/diagbot/entity/MedRescueNote.java

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

+ 22 - 19
src/main/java/com/diagbot/entity/MedTransferInNote.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_transfer_in_note")
 public class MedTransferInNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,12 +61,12 @@ public class MedTransferInNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 转入日期
      */
-    private LocalDateTime transferInDate;
+    private Date transferInDate;
 
     /**
      * 转出科室
@@ -118,7 +121,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -128,7 +131,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -148,12 +151,12 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -221,18 +224,18 @@ public class MedTransferInNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public LocalDateTime getTransferInDate() {
+    public Date getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(LocalDateTime transferInDate) {
+    public void setTransferInDate(Date transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -305,11 +308,11 @@ public class MedTransferInNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -319,11 +322,11 @@ public class MedTransferInNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -347,18 +350,18 @@ public class MedTransferInNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 21 - 19
src/main/java/com/diagbot/entity/MedTransferOutNote.java

@@ -1,6 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_transfer_out_note")
 public class MedTransferOutNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,12 +60,12 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 转入日期
      */
-    private LocalDateTime transferInDate;
+    private Date transferInDate;
 
     /**
      * 转出科室
@@ -118,7 +120,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -128,7 +130,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -148,12 +150,12 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -221,18 +223,18 @@ public class MedTransferOutNote implements Serializable {
     public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
-    public LocalDateTime getTransferInDate() {
+    public Date getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(LocalDateTime transferInDate) {
+    public void setTransferInDate(Date transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -305,11 +307,11 @@ public class MedTransferOutNote implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -319,11 +321,11 @@ public class MedTransferOutNote implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -347,18 +349,18 @@ public class MedTransferOutNote implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 19 - 16
src/main/java/com/diagbot/entity/MedWardRecord.java

@@ -1,6 +1,8 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -11,6 +13,7 @@ import java.io.Serializable;
  * @author cy
  * @since 2020-09-22
  */
+@TableName("med_ward_record")
 public class MedWardRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -58,7 +61,7 @@ public class MedWardRecord implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 查房医生
@@ -103,7 +106,7 @@ public class MedWardRecord implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -113,7 +116,7 @@ public class MedWardRecord implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -133,12 +136,12 @@ public class MedWardRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -206,11 +209,11 @@ public class MedWardRecord implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public LocalDateTime getRecordDate() {
+    public Date getRecordDate() {
         return recordDate;
     }
 
-    public void setRecordDate(LocalDateTime recordDate) {
+    public void setRecordDate(Date recordDate) {
         this.recordDate = recordDate;
     }
     public String getWardDoctor() {
@@ -269,11 +272,11 @@ public class MedWardRecord implements Serializable {
     public void setRecDoctor(String recDoctor) {
         this.recDoctor = recDoctor;
     }
-    public LocalDateTime getRecDate() {
+    public Date getRecDate() {
         return recDate;
     }
 
-    public void setRecDate(LocalDateTime recDate) {
+    public void setRecDate(Date recDate) {
         this.recDate = recDate;
     }
     public String getAuditDoctor() {
@@ -283,11 +286,11 @@ public class MedWardRecord implements Serializable {
     public void setAuditDoctor(String auditDoctor) {
         this.auditDoctor = auditDoctor;
     }
-    public LocalDateTime getAuditDate() {
+    public Date getAuditDate() {
         return auditDate;
     }
 
-    public void setAuditDate(LocalDateTime auditDate) {
+    public void setAuditDate(Date auditDate) {
         this.auditDate = auditDate;
     }
     public String getWholeData() {
@@ -311,18 +314,18 @@ public class MedWardRecord implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 426 - 63
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -1,22 +1,13 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.*;
-import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.DoctorAdvice;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.entity.HomePage;
-import com.diagbot.entity.MedCheckInfo;
-import com.diagbot.entity.MedCrisisInfo;
-import com.diagbot.entity.MedLisInfo;
-import com.diagbot.entity.MedLisResult;
-import com.diagbot.entity.MedPacsInfo;
-import com.diagbot.entity.MedPacsResult;
-import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -118,6 +109,52 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     MedCrisisInfoFacade medCrisisInfoFacade;
     @Autowired
     MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    MedConsultationApplyFacade medConsultationApplyFacade;
+    @Autowired
+    MedConsultationResultFacade medConsultationResultFacade;
+    @Autowired
+    MedConsultationNoteFacade medConsultationNoteFacade;
+    @Autowired
+    MedAdmissionNoteFacade medAdmissionNoteFacade;
+    @Autowired
+    MedBloodResultFacade medBloodResultFacade;
+    @Autowired
+    MedBloodTransfusionFacade medBloodTransfusionFacade;
+    @Autowired
+    MedCrisisNoteFacade medCrisisNoteFacade;
+    @Autowired
+    MedDeathDiscussionFacade medDeathDiscussionFacade;
+    @Autowired
+    MedDeathNoteFacade medDeathNoteFacade;
+    @Autowired
+    MedDifficultCaseFacade medDifficultCaseFacade;
+    @Autowired
+    MedFirstRecordFacade medFirstRecordFacade;
+    @Autowired
+    MedIllCriticallyFacade medIllCriticallyFacade;
+    @Autowired
+    MedIllSeriouslFacade medIllSeriouslFacade;
+    @Autowired
+    MedLeaveHospitalFacade medLeaveHospitalFacade;
+    @Autowired
+    MedOperativeFirstRecordFacade medOperativeFirstRecordFacade;
+    @Autowired
+    MedOperativeNoteFacade medOperativeNoteFacade;
+    @Autowired
+    MedPeriodConclusionFacade medPeriodConclusionFacade;
+    @Autowired
+    MedPreoperativeDiscussionFacade medPreoperativeDiscussionFacade;
+    @Autowired
+    MedRescueNoteFacade medRescueNoteFacade;
+    @Autowired
+    MedTransferInNoteFacade medTransferInNoteFacade;
+    @Autowired
+    MedTransferOutNoteFacade medTransferOutNoteFacade;
+    @Autowired
+    MedWardRecordFacade medWardRecordFacade;
+
+
 
     /**
      * 分页
@@ -248,7 +285,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         // 获取病历所有数据
         Map<String, Map<String, String>> dicMap = sysDictionaryFacade.getDictionaryWithKey(); // 获取字典信息
         // 获取文书信息
-        RecordContentVO recordContentVO = new RecordContentVO();
+      /*  RecordContentVO recordContentVO = new RecordContentVO();
         BeanUtil.copyProperties(analyzeVO, recordContentVO);
         List<RecordContentDTO> recordContentDTOList = medicalRecordFacade.getRecordContentFac(recordContentVO);
         String recTitle = "";
@@ -266,7 +303,207 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             }
         }
 
-        Map<String, List<RecordContentDTO>> recMap = EntityUtil.makeEntityListMap(recordContentDTOList, "standModelName");
+        Map<String, List<RecordContentDTO>> recMap = EntityUtil.makeEntityListMap(recordContentDTOList, "standModelName");*/
+
+//        -------------------------------------文书数据改造开始----------------------------------
+        // 获取会诊申请单
+        List<MedConsultationApply> medConsultationApplyList = medConsultationApplyFacade.list(new QueryWrapper<MedConsultationApply>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedConsultationApply.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("behospital_date")
+        );
+
+        // 获取会诊结果单
+        List<MedConsultationResult> medConsultationResultList = medConsultationResultFacade.list(new QueryWrapper<MedConsultationResult>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedConsultationResult.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("behospital_date")
+        );
+
+        // 会诊单(申请和结果)
+        List<MedConsultationNote> medConsultationNoteList = medConsultationNoteFacade.list(new QueryWrapper<MedConsultationNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedConsultationNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("behospital_date")
+        );
+
+        // 入院记录
+        List<MedAdmissionNote> medAdmissionNoteList = medAdmissionNoteFacade.list(new QueryWrapper<MedAdmissionNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedAdmissionNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("behospital_date")
+        );
+
+        // 输血效果评价
+        List<MedBloodResult> medBloodResultList = medBloodResultFacade.list(new QueryWrapper<MedBloodResult>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedBloodResult.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 输血记录
+        List<MedBloodTransfusion> medBloodTransfusionList = medBloodTransfusionFacade.list(new QueryWrapper<MedBloodTransfusion>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedBloodTransfusion.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 危急值记录
+        List<MedCrisisNote> medCrisisNoteList = medCrisisNoteFacade.list(new QueryWrapper<MedCrisisNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedCrisisNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 死亡病例讨论记录
+        List<MedDeathDiscussion> medDeathDiscussionList = medDeathDiscussionFacade.list(new QueryWrapper<MedDeathDiscussion>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedDeathDiscussion.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 死亡记录
+        List<MedDeathNote> medDeathNoteList = medDeathNoteFacade.list(new QueryWrapper<MedDeathNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedDeathNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("death_date")
+        );
+
+        // 疑难病例讨论记录
+        List<MedDifficultCase> medDifficultCaseList = medDifficultCaseFacade.list(new QueryWrapper<MedDifficultCase>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedDifficultCase.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 首次病程录
+        List<MedFirstRecord> medFirstRecordList = medFirstRecordFacade.list(new QueryWrapper<MedFirstRecord>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedFirstRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 病危通知单
+        List<MedIllCritically> medIllCriticallyList = medIllCriticallyFacade.list(new QueryWrapper<MedIllCritically>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedIllCritically.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("doctor_sign_date")
+        );
+
+        // 病重通知单
+        List<MedIllSeriousl> medIllSeriouslList = medIllSeriouslFacade.list(new QueryWrapper<MedIllSeriousl>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedIllSeriousl.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("doctor_sign_date")
+        );
+
+        // 出院小结
+        List<MedLeaveHospital> medLeaveHospitalList = medLeaveHospitalFacade.list(new QueryWrapper<MedLeaveHospital>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedLeaveHospital.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("leave_hospital_date")
+        );
+
+        // 术后首程
+        List<MedOperativeFirstRecord> medOperativeFirstRecordList = medOperativeFirstRecordFacade.list(new QueryWrapper<MedOperativeFirstRecord>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedOperativeFirstRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 手术记录
+        List<MedOperativeNote> medOperativeNoteList = medOperativeNoteFacade.list(new QueryWrapper<MedOperativeNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedOperativeNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 阶段小结
+        List<MedPeriodConclusion> medPeriodConclusionList = medPeriodConclusionFacade.list(new QueryWrapper<MedPeriodConclusion>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedPeriodConclusion.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 术前讨论小结
+        List<MedPreoperativeDiscussion> medPreoperativeDiscussionList = medPreoperativeDiscussionFacade.list(new QueryWrapper<MedPreoperativeDiscussion>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedPreoperativeDiscussion.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 抢救记录
+        List<MedRescueNote> medRescueNoteList = medRescueNoteFacade.list(new QueryWrapper<MedRescueNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedRescueNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+
+        // 转入记录
+        List<MedTransferInNote> medTransferInNoteList = medTransferInNoteFacade.list(new QueryWrapper<MedTransferInNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedTransferInNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("transfer_in_date")
+        );
+
+        // 转出记录
+        List<MedTransferOutNote> medTransferOutNoteList = medTransferOutNoteFacade.list(new QueryWrapper<MedTransferOutNote>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedTransferOutNote.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("transfer_in_date")
+        );
+
+        // 查房记录
+        List<MedWardRecord> medWardRecordList = medWardRecordFacade.list(new QueryWrapper<MedWardRecord>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .select(MedWardRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .orderByAsc("rec_date")
+        );
+//        -------------------------------------文书数据改造结束----------------------------------
 
         // 获取医嘱
         List<DoctorAdvice> doctorAdviceList = doctorAdviceFacade.list(new QueryWrapper<DoctorAdvice>()
@@ -339,55 +576,159 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
 
 
-    // 化验
-       // List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
-    //使用sql进行关联优化数据查询
+        // 化验
+        // List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
+        //使用sql进行关联优化数据查询
         List<MedLisResultDTO> medLisResultListDTO = medLisResultFacade.getMedLisResultList(behospitalInfoList.get(0));
-        List<MedLisResult> medLisResultList =new ArrayList<>();
+        List<MedLisResult> medLisResultList = new ArrayList<>();
         for (MedLisResultDTO medLisResultSingle : medLisResultListDTO) {
             MedLisResult medLisResult = new MedLisResult();
-            BeanUtil.copyProperties(medLisResultSingle,medLisResult);
-            medLisResult.setItemName( medLisResultSingle.getRepName()+ "=" +medLisResultSingle.getReportName());
+            BeanUtil.copyProperties(medLisResultSingle, medLisResult);
+            medLisResult.setItemName(medLisResultSingle.getRepName() + "=" + medLisResultSingle.getReportName());
             medLisResultList.add(medLisResult);
         }
 
         // 辅检
-       // List<MedPacsResult> medPacsResultList = getMedPacsResultList(behospitalInfoList.get(0));
-      //使用sql进行关联优化数据查询
+        // List<MedPacsResult> medPacsResultList = getMedPacsResultList(behospitalInfoList.get(0));
+        //使用sql进行关联优化数据查询
         List<MedPacsResult> medPacsResultList = medPacsResultFacade.getMedPacsResultList(behospitalInfoList.get(0));
 
+
+
+        /**
+         * 文书数据拼接
+         */
+        //会诊申请单
+        newAddData("会诊申请单",medConsultationApplyList,medrecVoList);
+
+        //会诊结果单
+        newAddData("会诊结果单",medConsultationResultList,medrecVoList);
+
+        //会诊单(申请和结果)
+        newAddData("会诊单(申请和结果)",medConsultationNoteList,medrecVoList);
+
+        //入院记录
+        newAddData("入院记录",medAdmissionNoteList,medrecVoList);
+
+        //输血效果评价
+        newAddData("输血效果评价",medBloodResultList,medrecVoList);
+
+        //输血记录
+        newAddData("输血记录",medBloodTransfusionList,medrecVoList);
+
+        //危急值记录
+        newAddData("危急值记录",medCrisisNoteList,medrecVoList);
+
+        //死亡病例讨论记录
+        newAddData("死亡病例讨论记录",medDeathDiscussionList,medrecVoList);
+
+        //死亡记录
+        newAddData("死亡记录",medDeathNoteList,medrecVoList);
+
+        //疑难病例讨论记录
+        newAddData("疑难病例讨论记录",medDifficultCaseList,medrecVoList);
+
+        //首次病程录
+        newAddData("首次病程录",medFirstRecordList,medrecVoList);
+
+        //病危通知单
+        newAddData("病危通知单",medIllCriticallyList,medrecVoList);
+
+        //病重通知单
+        newAddData("病重通知单",medIllSeriouslList,medrecVoList);
+
+        //出院小结
+        newAddData("出院小结",medLeaveHospitalList,medrecVoList);
+
+        //术后首程
+        newAddData("术后首程",medOperativeFirstRecordList,medrecVoList);
+
+        //手术记录
+        newAddData("手术记录",medOperativeNoteList,medrecVoList);
+
+        //阶段小结
+        newAddData("阶段小结",medPeriodConclusionList,medrecVoList);
+
+        //术前讨论小结
+        newAddData("术前讨论小结",medPreoperativeDiscussionList,medrecVoList);
+
+        //抢救记录
+        newAddData("抢救记录",medRescueNoteList,medrecVoList);
+
+        //转入记录
+        newAddData("转入记录",medTransferInNoteList,medrecVoList);
+
+        //转出记录
+        newAddData("转出记录",medTransferOutNoteList,medrecVoList);
+
+        //查房记录
+        newAddData("查房记录",medWardRecordList,medrecVoList);
+
+
         // 会诊记录
-        addDataWithKey("会诊", recMap, medrecVoList,
-                Arrays.asList("会诊记录", "会诊结果单", "会诊申请单"));
+//        addDataWithKey("会诊", recMap, medrecVoList,
+//                Arrays.asList("会诊记录", "会诊结果单", "会诊申请单"));
 
         // 手术
-        addDataWithKey("手术", recMap, medrecVoList,
-                Arrays.asList("术后首次病程及谈话记录", "手术记录",
-                        "术前讨论、术前小结", "手术知情同意书", "手术安全核查表"));
+        /**
+         * "手术知情同意书", "手术安全核查表"    谈话记录表现有表格没有
+         */
+//        addDataWithKey("手术", recMap, medrecVoList,
+//                Arrays.asList("术后首次病程及谈话记录", "手术记录",
+//                        "术前讨论、术前小结", "手术知情同意书", "手术安全核查表"));
 
         // 转科
-        addDataWithKey("转科", recMap, medrecVoList,
-                Arrays.asList("转入记录", "转出记录"));
-
-        addData("入院记录", recMap, medrecVoList);
-        addData("病危通知书", recMap, medrecVoList);
-        addData("阶段小结", recMap, medrecVoList);
-        addData("抢救记录", recMap, medrecVoList);
-        addData("查房记录", recMap, medrecVoList);
-        addData("首次病程录", recMap, medrecVoList);
-        addData("输血/血制品病程记录", recMap, medrecVoList);
-        addData("输血后效果评价", recMap, medrecVoList);
-        addData("死亡病例讨论记录", recMap, medrecVoList);
-        addData("死亡记录", recMap, medrecVoList);
-        addData("危急值记录", recMap, medrecVoList);
-        addData("出院小结", recMap, medrecVoList);
-        addData("疑难病例讨论记录", recMap, medrecVoList);
-        addData("输血后效果评价", recMap, medrecVoList);
-        addData("病理检验送检单", recMap, medrecVoList);
-        addData("日常病程录", recMap, medrecVoList);
-
-        addDataWithInnerKey("知情同意书", recMap, medrecVoList);
-        addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
+
+//        addDataWithKey("转科", recMap, medrecVoList,
+//                Arrays.asList("转入记录", "转出记录"));
+
+       // addData("入院记录", recMap, medrecVoList);
+
+       // addData("病危通知书", recMap, medrecVoList);
+
+       // addData("阶段小结", recMap, medrecVoList);
+
+     //   addData("抢救记录", recMap, medrecVoList);
+
+      //  addData("查房记录", recMap, medrecVoList);
+
+     //   addData("首次病程录", recMap, medrecVoList);
+        /**
+         * ?
+         */
+       // addData("输血/血制品病程记录", recMap, medrecVoList);
+
+       // addData("输血后效果评价", recMap, medrecVoList);
+
+       // addData("死亡病例讨论记录", recMap, medrecVoList);
+
+       // addData("死亡记录", recMap, medrecVoList);
+
+      //  addData("危急值记录", recMap, medrecVoList);
+
+      //  addData("出院小结", recMap, medrecVoList);
+
+       // addData("疑难病例讨论记录", recMap, medrecVoList);
+        /**
+         * ?
+         */
+       // addData("输血后效果评价", recMap, medrecVoList);
+        /**
+         * ?
+         */
+       // addData("病理检验送检单", recMap, medrecVoList);
+        /**
+         * 是首次病程录么?
+         */
+       // addData("日常病程录", recMap, medrecVoList);
+        /**
+         * ?
+         */
+       // addDataWithInnerKey("知情同意书", recMap, medrecVoList);
+        /**
+         * ?
+         */
+       // addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
 
         // 医嘱
         if (ListUtil.isNotEmpty(doctorAdviceList)) {
@@ -555,8 +896,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         // 计算分值并保存结果至数据库
         Map<String, Object> resMap = calScoreAndSave(outputInfo, codeList, codeToInfoMap, analyzeVO, queryVo.getBehospitalInfo().getIsPlacefile());
-        AlgorithmDTO algorithmDTO = (AlgorithmDTO)resMap.get("algorithmDTO");
-        Date date = (Date)resMap.get("date");
+        AlgorithmDTO algorithmDTO = (AlgorithmDTO) resMap.get("algorithmDTO");
+        Date date = (Date) resMap.get("date");
 
         // 返回提示信息
         //        List<MsgDTO> msgDTOList = getMsg(analyzeVO);
@@ -595,6 +936,23 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
+    /**
+     * 1.5.0拼接数据
+     *
+     * @param key
+     * @param objectData
+     * @param medrecVoList
+     */
+    public void newAddData(String key, Object objectData, List<MedrecVo> medrecVoList) {
+        if (ObjectUtils.isNotEmpty(objectData)) {
+            MedrecVo medrecVo = new MedrecVo();
+            medrecVo.setTitle(key);
+            Map<String, Object> content = new HashMap<>();
+            content.put("content", objectData);
+            medrecVo.setContent(content);
+            medrecVoList.add(medrecVo);
+        }
+    }
 
     /**
      * 拼接数据(例如:手术)
@@ -671,13 +1029,18 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         medrecVo.setTitle(key);
         Map<String, Object> content = new HashMap<>();
         List<String> contents = new ArrayList<>();
-
+//通过字典里面的分组,确定所需字段来过滤数据
+        //通用封装格式,采用List<T> list
         for (T bean : list) {
             try {
                 Map<String, String> res = new HashMap<>();
+//                将对象转化为kv格式,方便处理字段
                 Map<String, Object> objectMap = MapUtil.objectToMap(bean);
+                //遍历查出数据所有字段
                 for (String objKey : objectMap.keySet()) {
+                    //分组1 所需要展示的所有字段  过滤一部分数据
                     if (map.get(objKey) != null) {
+//                        目标数据的时间格式转化 为字符串
                         if (dateList.contains(objKey)) {
                             Date date = (Date) objectMap.get(objKey);
                             res.put(map.get(objKey), DateUtil.formatDateTime(date).replaceAll("null", ""));
@@ -1139,7 +1502,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         ExcelUtils.exportExcelUser(res, null, "sheet1", ExportExcelDTO.class, fileName, response);
     }
 
-    private void exportQcresultVOSet(ExportQcresultVO exportQcresultVO){
+    private void exportQcresultVOSet(ExportQcresultVO exportQcresultVO) {
         //入参验证
         long interval = 7 * 24 * 60 * 60 * 1000;
         //入院时间
@@ -1175,8 +1538,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     /**
      * 设置共用code数据
      *
-     * @param outputInfo 质控出参数据
-     * @param codeList 质控编码列表
+     * @param outputInfo    质控出参数据
+     * @param codeList      质控编码列表
      * @param codeToInfoMap 质控编码对应的info信息
      */
     public void setCodeData(OutputInfo outputInfo, List<String> codeList, Map<String, String> codeToInfoMap) {
@@ -1194,10 +1557,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     /**
      * 计算分值并保存结果至数据库
      *
-     * @param outputInfo 质控出参数据
-     * @param codeList 质控编码列表
+     * @param outputInfo    质控出参数据
+     * @param codeList      质控编码列表
      * @param codeToInfoMap 质控编码对应的info信息
-     * @param analyzeVO 入参
+     * @param analyzeVO     入参
      * @return
      */
     public Map<String, Object> calScoreAndSave(OutputInfo outputInfo, List<String> codeList,
@@ -1282,10 +1645,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @param analyzeCdsVO
      * @return
      */
-    public Map<String,String> analyzeCds(AnalyzeCdsVO analyzeCdsVO) {
-        Map<String,String> ret = Maps.newHashMap();
+    public Map<String, String> analyzeCds(AnalyzeCdsVO analyzeCdsVO) {
+        Map<String, String> ret = Maps.newHashMap();
         List<QcCasesEntryDTO> qcCasesEntryDTOList = qcCasesEntryFacade.getQcCasesEntryCds(analyzeCdsVO);
-        Map<String,String> codeMsgMap = qcCasesEntryDTOList.stream().collect(Collectors.toMap(i->i.getCode(),i->i.getMsg()));
+        Map<String, String> codeMsgMap = qcCasesEntryDTOList.stream().collect(Collectors.toMap(i -> i.getCode(), i -> i.getMsg()));
 
         QueryVo queryVo = new QueryVo();
         queryVo.setCid(basHospitalInfoFacade.getHosCode(analyzeCdsVO.getHospitalId())); // 设置医院编码
@@ -1331,8 +1694,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
 
         OutputInfo outputInfo = response.getData();
-        outputInfo.getResult().keySet().forEach(key->{
-            ret.put(codeMsgMap.get(key),outputInfo.getResult().get(key).get("info"));
+        outputInfo.getResult().keySet().forEach(key -> {
+            ret.put(codeMsgMap.get(key), outputInfo.getResult().get(key).get("info"));
         });
 
         return ret;

+ 13 - 0
src/main/java/com/diagbot/facade/MedAdmissionNoteFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
+}

+ 13 - 0
src/main/java/com/diagbot/facade/MedBloodResultFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedBloodResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedBloodResultFacade extends MedBloodResultServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedBloodTransfusionFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedBloodTransfusionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedConsultationApplyFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.HomePageServiceImpl;
+import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedConsultationApplyFacade extends MedConsultationApplyServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedConsultationNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
+import com.diagbot.service.impl.MedConsultationNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedConsultationResultFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
+import com.diagbot.service.impl.MedConsultationResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedConsultationResultFacade extends MedConsultationResultServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedCrisisNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedCrisisNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedDeathDiscussionFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedDeathDiscussionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedDeathNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedDeathNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedDeathNoteFacade extends MedDeathNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedDifficultCaseFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedDeathNoteServiceImpl;
+import com.diagbot.service.impl.MedDifficultCaseServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedDifficultCaseFacade extends MedDifficultCaseServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedFirstRecordFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedFirstRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedFirstRecordFacade extends MedFirstRecordServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedIllCriticallyFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedIllCriticallyServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedIllSeriouslFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedIllSeriouslServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedLeaveHospitalFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedLeaveHospitalServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedOperativeFirstRecordFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedOperativeFirstRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedOperativeFirstRecordFacade extends MedOperativeFirstRecordServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedOperativeNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedOperativeNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedPeriodConclusionFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedPeriodConclusionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedPreoperativeDiscussionFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedPreoperativeDiscussionServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedRescueNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedRescueNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedRescueNoteFacade extends MedRescueNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedTransferInNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedTransferInNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedTransferOutNoteFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedTransferOutNoteServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
+}

+ 14 - 0
src/main/java/com/diagbot/facade/MedWardRecordFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.MedWardRecordServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class MedWardRecordFacade extends MedWardRecordServiceImpl {
+}