Преглед на файлове

增加解析相关代码

liuqq преди 4 години
родител
ревизия
332ce9d6f1
променени са 33 файла, в които са добавени 2015 реда и са изтрити 215 реда
  1. 16 16
      src/main/java/com/diagbot/entity/MedBloodResult.java
  2. 22 22
      src/main/java/com/diagbot/entity/MedBloodTransfusion.java
  3. 19 19
      src/main/java/com/diagbot/entity/MedDifficultCase.java
  4. 16 16
      src/main/java/com/diagbot/entity/MedFirstRecord.java
  5. 16 16
      src/main/java/com/diagbot/entity/MedIllCritically.java
  6. 16 16
      src/main/java/com/diagbot/entity/MedIllSeriousl.java
  7. 16 16
      src/main/java/com/diagbot/entity/MedPeriodConclusion.java
  8. 19 19
      src/main/java/com/diagbot/entity/MedTransferInNote.java
  9. 19 19
      src/main/java/com/diagbot/entity/MedTransferOutNote.java
  10. 8 5
      src/main/java/com/diagbot/enums/CacheKeyEnum.java
  11. 47 0
      src/main/java/com/diagbot/facade/data/AMedBloodResultFacade.java
  12. 49 0
      src/main/java/com/diagbot/facade/data/AMedBloodTransfusionFacade.java
  13. 78 0
      src/main/java/com/diagbot/facade/data/AMedDifficultCaseFacade.java
  14. 48 0
      src/main/java/com/diagbot/facade/data/AMedFirstRecordFacade.java
  15. 47 0
      src/main/java/com/diagbot/facade/data/AMedIllCriticallyFacade.java
  16. 80 0
      src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacade.java
  17. 0 33
      src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacsde.java
  18. 49 0
      src/main/java/com/diagbot/facade/data/AMedPeriodConclusionFacade.java
  19. 48 0
      src/main/java/com/diagbot/facade/data/AMedTransferInNoteFacade.java
  20. 48 0
      src/main/java/com/diagbot/facade/data/AMedTransferOutNoteFacade.java
  21. 11 1
      src/main/java/com/diagbot/facade/data/ColumnFacade.java
  22. 7 1
      src/main/java/com/diagbot/mapper/MedDifficultCaseMapper.java
  23. 117 0
      src/main/java/com/diagbot/vo/data/AMedBloodResultVO.java
  24. 136 0
      src/main/java/com/diagbot/vo/data/AMedBloodTransfusionVO.java
  25. 151 0
      src/main/java/com/diagbot/vo/data/AMedDifficultCaseVO.java
  26. 161 0
      src/main/java/com/diagbot/vo/data/AMedFirstRecordVO.java
  27. 121 0
      src/main/java/com/diagbot/vo/data/AMedIllCriticallyVO.java
  28. 121 0
      src/main/java/com/diagbot/vo/data/AMedIllSeriouslVO.java
  29. 151 0
      src/main/java/com/diagbot/vo/data/AMedPeriodConclusionVO.java
  30. 161 0
      src/main/java/com/diagbot/vo/data/AMedTransferInNoteVO.java
  31. 161 0
      src/main/java/com/diagbot/vo/data/AMedTransferOutNoteVO.java
  32. 17 16
      src/main/resources/mapper/MedDeathNoteMapper.xml
  33. 39 0
      src/main/resources/mapper/MedDifficultCaseMapper.xml

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedBloodResult implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -78,7 +78,7 @@ public class MedBloodResult implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -88,7 +88,7 @@ public class MedBloodResult implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -108,12 +108,12 @@ public class MedBloodResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -181,11 +181,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 getRecTitle() {
@@ -209,11 +209,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() {
@@ -223,11 +223,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() {
@@ -251,18 +251,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -68,12 +68,12 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 开始时间
      */
-    private LocalDateTime startTime;
+    private Date startTime;
 
     /**
      * 结束时间
      */
-    private LocalDateTime endTime;
+    private Date endTime;
 
     /**
      * 输血原因
@@ -98,7 +98,7 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -108,7 +108,7 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -128,12 +128,12 @@ public class MedBloodTransfusion implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -201,11 +201,11 @@ 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 String getRecTitle() {
@@ -215,18 +215,18 @@ public class MedBloodTransfusion implements Serializable {
     public void setRecTitle(String recTitle) {
         this.recTitle = recTitle;
     }
-    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() {
@@ -257,11 +257,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() {
@@ -271,11 +271,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() {
@@ -299,18 +299,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() {

+ 19 - 19
src/main/java/com/diagbot/entity/MedDifficultCase.java

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -68,7 +68,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 讨论日期
      */
-    private LocalDateTime discussDate;
+    private Date discussDate;
 
     /**
      * 讨论地点
@@ -113,7 +113,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -123,7 +123,7 @@ public class MedDifficultCase implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -143,12 +143,12 @@ public class MedDifficultCase implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -216,11 +216,11 @@ 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 String getRecTitle() {
@@ -230,11 +230,11 @@ public class MedDifficultCase implements Serializable {
     public void setRecTitle(String recTitle) {
         this.recTitle = recTitle;
     }
-    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 +293,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() {
@@ -307,11 +307,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() {
@@ -335,18 +335,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -123,7 +123,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -133,7 +133,7 @@ public class MedFirstRecord implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -153,12 +153,12 @@ public class MedFirstRecord implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -226,11 +226,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 getRecTitle() {
@@ -317,11 +317,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() {
@@ -331,11 +331,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() {
@@ -359,18 +359,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -83,7 +83,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 患者签名时间
      */
-    private LocalDateTime patientSignDate;
+    private Date patientSignDate;
 
     /**
      * 医生签名
@@ -93,7 +93,7 @@ public class MedIllCritically implements Serializable {
     /**
      * 医生签名时间
      */
-    private LocalDateTime doctorSignDate;
+    private Date doctorSignDate;
 
     /**
      * 结构化数据
@@ -113,12 +113,12 @@ public class MedIllCritically implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -186,11 +186,11 @@ public class MedIllCritically 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 getRecTitle() {
@@ -221,11 +221,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() {
@@ -235,11 +235,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() {
@@ -263,18 +263,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -83,7 +83,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 患者签名时间
      */
-    private LocalDateTime patientSignDate;
+    private Date patientSignDate;
 
     /**
      * 医生签名
@@ -93,7 +93,7 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 医生签名时间
      */
-    private LocalDateTime doctorSignDate;
+    private Date doctorSignDate;
 
     /**
      * 结构化数据
@@ -113,12 +113,12 @@ public class MedIllSeriousl implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -186,11 +186,11 @@ public class MedIllSeriousl 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 getRecTitle() {
@@ -221,11 +221,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() {
@@ -235,11 +235,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() {
@@ -263,18 +263,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -113,7 +113,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -123,7 +123,7 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -143,12 +143,12 @@ public class MedPeriodConclusion implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -216,11 +216,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 getRecTitle() {
@@ -293,11 +293,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() {
@@ -307,11 +307,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() {
@@ -335,18 +335,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -68,7 +68,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 转入日期
      */
-    private LocalDateTime transferInDate;
+    private Date transferInDate;
 
     /**
      * 转出科室
@@ -123,7 +123,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -133,7 +133,7 @@ public class MedTransferInNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -153,12 +153,12 @@ public class MedTransferInNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -226,11 +226,11 @@ 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 String getRecTitle() {
@@ -240,11 +240,11 @@ public class MedTransferInNote implements Serializable {
     public void setRecTitle(String recTitle) {
         this.recTitle = recTitle;
     }
-    public LocalDateTime getTransferInDate() {
+    public Date getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(LocalDateTime transferInDate) {
+    public void setTransferInDate(Date transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -317,11 +317,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() {
@@ -331,11 +331,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() {
@@ -359,18 +359,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() {

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

@@ -1,7 +1,7 @@
 package com.diagbot.entity;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 病历日期
      */
-    private LocalDateTime recordDate;
+    private Date recordDate;
 
     /**
      * 标题
@@ -68,7 +68,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 转入日期
      */
-    private LocalDateTime transferInDate;
+    private Date transferInDate;
 
     /**
      * 转出科室
@@ -123,7 +123,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录时间
      */
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 审核医生
@@ -133,7 +133,7 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 审核时间
      */
-    private LocalDateTime auditDate;
+    private Date auditDate;
 
     /**
      * 结构化数据
@@ -153,12 +153,12 @@ public class MedTransferOutNote implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人
@@ -226,11 +226,11 @@ 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 String getRecTitle() {
@@ -240,11 +240,11 @@ public class MedTransferOutNote implements Serializable {
     public void setRecTitle(String recTitle) {
         this.recTitle = recTitle;
     }
-    public LocalDateTime getTransferInDate() {
+    public Date getTransferInDate() {
         return transferInDate;
     }
 
-    public void setTransferInDate(LocalDateTime transferInDate) {
+    public void setTransferInDate(Date transferInDate) {
         this.transferInDate = transferInDate;
     }
     public String getTransferOutDept() {
@@ -317,11 +317,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() {
@@ -331,11 +331,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() {
@@ -359,18 +359,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() {

+ 8 - 5
src/main/java/com/diagbot/enums/CacheKeyEnum.java

@@ -3,8 +3,13 @@ package com.diagbot.enums;
 import lombok.Setter;
 
 public enum CacheKeyEnum implements KeyedString {
-
     BEHOSPITAL_INFO("入院记录", "medAdmissionNote"),
+    BLOOD_RESULT("输血后效果评价", "medBloodResult"),
+    BLOOD_TRANSFUSION("输血/血制品病程记录", "medBloodTransfusion"),
+    PERIOD_CONCLUSION("阶段小结", "medPeriodConclusion"),
+    FIRST_RECORD("首次病程录","medFirstRecord"),
+    TRANSFER_IN_NOTE("转入记录", "medTransferInNote"),
+    TRANSFER_OUT_NOTE("转出记录", "medTransferOutNote"),
     CONSULTATION_NOTE("会诊单", "medConsultationNote");
     /*
     FIRST_RECORD(2, "aMedFirstRecordFacade"),
@@ -31,13 +36,11 @@ public enum CacheKeyEnum implements KeyedString {
     CRISIS_NOTE(23, "危急值记录"),
     DEATH_NOTE(24, "死亡记录"),
     ILL_CRITICALLY(25, "病危通知书"),
-    TRANSFER_IN_NOTE(26, "转入记录"),
-    TRANSFER_OUT_NOTE(27, "转出记录"),
-    PERIOD_CONCLUSION(28, "阶段小结"),
+
     ILL_SERIOUSL(29, "病重通知书"),
     CONSULTATION_APPLY(30, "aMedConsultationApplyFacade"),
     CONSULTATION_RESULT(31, "aMedConsultationResultFacade"),
-    DATA_MODEL(32, "输血后效果评价"),
+
     DATA_MODEL(33, "专科交接单"),
     DATA_MODEL(34, "转科记录"),
     DATA_MODEL(35, "病理检验送检单"),

+ 47 - 0
src/main/java/com/diagbot/facade/data/AMedBloodResultFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedBloodResult;
 import com.diagbot.service.impl.MedBloodResultServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedBloodResultVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -27,4 +34,44 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
         }
         //Map<String, String> map=columnFacade.getColumn("medBloodResul");
     }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedBloodResultVO medBloodResultVO=(AMedBloodResultVO) MapUtil.mapToObject(entityMap, AMedBloodResultVO.class);
+            MedBloodResult medBloodResult=new MedBloodResult();
+            BeanUtils.copyProperties(medBloodResultVO,medBloodResult);
+            medBloodResult.setHospitalId(hospitalId);//医院编码
+            medBloodResult.setAuditDate(DateUtil.parseDateTime(medBloodResultVO.getAuditDate()));//审核时间
+            medBloodResult.setRecDate(DateUtil.parseDateTime(medBloodResultVO.getRecDate()));//记录时间
+            medBloodResult.setRecordDate(DateUtil.parseDateTime(medBloodResultVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medBloodResult)){
+                medBloodResult.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodResult);
+            }else{
+                medBloodResult.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodResult,new QueryWrapper<MedBloodResult>()
+                        .eq("rec_id", medBloodResult.getRecId())
+                        .eq("hospital_id", medBloodResult.getHospitalId())
+                        .eq("behospital_code", medBloodResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedBloodResult medBloodResult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedBloodResult>()
+                .eq("rec_id", medBloodResult.getRecId())
+                .eq("hospital_id", medBloodResult.getHospitalId())
+                .eq("behospital_code", medBloodResult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
 }

+ 49 - 0
src/main/java/com/diagbot/facade/data/AMedBloodTransfusionFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedBloodTransfusion;
 import com.diagbot.service.impl.MedBloodTransfusionServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedBloodTransfusionVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,4 +36,46 @@ public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
             return;
         }
     }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedBloodTransfusionVO medBloodTransfusionVO=(AMedBloodTransfusionVO) MapUtil.mapToObject(entityMap, AMedBloodTransfusionVO.class);
+            MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
+            BeanUtils.copyProperties(medBloodTransfusionVO,medBloodTransfusion);
+            medBloodTransfusion.setHospitalId(hospitalId);//医院编码
+            medBloodTransfusion.setStartTime(DateUtil.parseDateTime(medBloodTransfusionVO.getStartTime()));
+            medBloodTransfusion.setEndTime(DateUtil.parseDateTime(medBloodTransfusionVO.getEndTime()));
+            medBloodTransfusion.setAuditDate(DateUtil.parseDateTime(medBloodTransfusionVO.getAuditDate()));//审核时间
+            medBloodTransfusion.setRecDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecDate()));//记录时间
+            medBloodTransfusion.setRecordDate(DateUtil.parseDateTime(medBloodTransfusionVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medBloodTransfusion)){
+                medBloodTransfusion.setGmtCreate(new Date());//记录创建时间
+                this.save(medBloodTransfusion);
+            }else{
+                medBloodTransfusion.setGmtModified(new Date());//记录修改时间
+                this.update(medBloodTransfusion,new QueryWrapper<MedBloodTransfusion>()
+                        .eq("rec_id", medBloodTransfusion.getRecId())
+                        .eq("hospital_id", medBloodTransfusion.getHospitalId())
+                        .eq("behospital_code", medBloodTransfusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedBloodTransfusion medBloodTransfusion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedBloodTransfusion>()
+                .eq("rec_id", medBloodTransfusion.getRecId())
+                .eq("hospital_id", medBloodTransfusion.getHospitalId())
+                .eq("behospital_code", medBloodTransfusion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
 }

+ 78 - 0
src/main/java/com/diagbot/facade/data/AMedDifficultCaseFacade.java

@@ -0,0 +1,78 @@
+package com.diagbot.facade.data;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedDifficultCase;
+import com.diagbot.service.impl.MedDifficultCaseServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedDifficultCaseVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
+    @Autowired
+    private ColumnFacade columnFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medIllSeriousl");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedDifficultCaseVO medDifficultVO=(AMedDifficultCaseVO) MapUtil.mapToObject(entityMap, AMedDifficultCaseVO.class);
+            MedDifficultCase medDifficult=new MedDifficultCase();
+            BeanUtils.copyProperties(medDifficultVO,medDifficult);
+            medDifficult.setHospitalId(hospitalId);//医院编码
+            medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
+            medDifficult.setAuditDate(DateUtil.parseDateTime(medDifficultVO.getAuditDate()));
+            medDifficult.setDiscussDate(DateUtil.parseDateTime(medDifficultVO.getDiscussDate()));
+            medDifficult.setRecordDate(DateUtil.parseDateTime(medDifficultVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medDifficult)){
+                medDifficult.setGmtCreate(new Date());//记录创建时间
+                this.save(medDifficult);
+            }else{
+                medDifficult.setGmtModified(new Date());//记录修改时间
+                this.update(medDifficult,new QueryWrapper<MedDifficultCase>()
+                        .eq("rec_id", medDifficult.getRecId())
+                        .eq("hospital_id", medDifficult.getHospitalId())
+                        .eq("behospital_code", medDifficult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedDifficultCase medDifficult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedDifficultCase>()
+                .eq("rec_id", medDifficult.getRecId())
+                .eq("hospital_id", medDifficult.getHospitalId())
+                .eq("behospital_code", medDifficult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

+ 48 - 0
src/main/java/com/diagbot/facade/data/AMedFirstRecordFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedFirstRecord;
 import com.diagbot.service.impl.MedFirstRecordServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedFirstRecordVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,4 +37,45 @@ public class AMedFirstRecordFacade extends MedFirstRecordServiceImpl {
             return;
         }
     }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedFirstRecordVO medFirstRecordVO=(AMedFirstRecordVO) MapUtil.mapToObject(entityMap, AMedFirstRecordVO.class);
+            MedFirstRecord medFirstRecord=new MedFirstRecord();
+            BeanUtils.copyProperties(medFirstRecordVO,medFirstRecord);
+            medFirstRecord.setHospitalId(hospitalId);//医院编码
+
+            medFirstRecord.setAuditDate(DateUtil.parseDateTime(medFirstRecordVO.getAuditDate()));//审核时间
+            medFirstRecord.setRecDate(DateUtil.parseDateTime(medFirstRecordVO.getRecDate()));//记录时间
+            medFirstRecord.setRecordDate(DateUtil.parseDateTime(medFirstRecordVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medFirstRecord)){
+                medFirstRecord.setGmtCreate(new Date());//记录创建时间
+                this.save(medFirstRecord);
+            }else{
+                medFirstRecord.setGmtModified(new Date());//记录修改时间
+                this.update(medFirstRecord,new QueryWrapper<MedFirstRecord>()
+                        .eq("rec_id", medFirstRecord.getRecId())
+                        .eq("hospital_id", medFirstRecord.getHospitalId())
+                        .eq("behospital_code", medFirstRecord.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedFirstRecord medFirstRecord){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedFirstRecord>()
+                .eq("rec_id", medFirstRecord.getRecId())
+                .eq("hospital_id", medFirstRecord.getHospitalId())
+                .eq("behospital_code", medFirstRecord.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
 }

+ 47 - 0
src/main/java/com/diagbot/facade/data/AMedIllCriticallyFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedIllCritically;
 import com.diagbot.service.impl.MedIllCriticallyServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedIllCriticallyVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,4 +37,44 @@ public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
             return;
         }
     }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedIllCriticallyVO medIllCriticallyVO=(AMedIllCriticallyVO) MapUtil.mapToObject(entityMap, AMedIllCriticallyVO.class);
+            MedIllCritically medIllCritically=new MedIllCritically();
+            BeanUtils.copyProperties(medIllCriticallyVO,medIllCritically);
+            medIllCritically.setHospitalId(hospitalId);//医院编码
+            medIllCritically.setPatientSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getPatientSignDate()));
+            medIllCritically.setDoctorSignDate(DateUtil.parseDateTime(medIllCriticallyVO.getDoctorSignDate()));//审核时间
+            medIllCritically.setRecordDate(DateUtil.parseDateTime(medIllCriticallyVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medIllCritically)){
+                medIllCritically.setGmtCreate(new Date());//记录创建时间
+                this.save(medIllCritically);
+            }else{
+                medIllCritically.setGmtModified(new Date());//记录修改时间
+                this.update(medIllCritically,new QueryWrapper<MedIllCritically>()
+                        .eq("rec_id", medIllCritically.getRecId())
+                        .eq("hospital_id", medIllCritically.getHospitalId())
+                        .eq("behospital_code", medIllCritically.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedIllCritically MedIllCritically){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedIllCritically>()
+                .eq("rec_id", MedIllCritically.getRecId())
+                .eq("hospital_id", MedIllCritically.getHospitalId())
+                .eq("behospital_code", MedIllCritically.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
 }

+ 80 - 0
src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacade.java

@@ -0,0 +1,80 @@
+package com.diagbot.facade.data;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedIllSeriousl;
+import com.diagbot.service.impl.MedIllSeriouslServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedIllSeriouslVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AMedIllSeriouslFacade extends MedIllSeriouslServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+
+    public void getColumnZhAndCh(){
+        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
+        list.forEach(s->{
+            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
+        });
+
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Boolean flag=columnFacade.createColumn(columnMap,"medIllSeriousl");
+
+        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedIllSeriouslVO medIllSeriouslVO=(AMedIllSeriouslVO) MapUtil.mapToObject(entityMap, AMedIllSeriouslVO.class);
+            MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
+            BeanUtils.copyProperties(medIllSeriouslVO,medIllSeriousl);
+            medIllSeriousl.setHospitalId(hospitalId);//医院编码
+            medIllSeriousl.setPatientSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getPatientSignDate()));
+            medIllSeriousl.setDoctorSignDate(DateUtil.parseDateTime(medIllSeriouslVO.getDoctorSignDate()));//审核时间
+            medIllSeriousl.setRecordDate(DateUtil.parseDateTime(medIllSeriouslVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medIllSeriousl)){
+                medIllSeriousl.setGmtCreate(new Date());//记录创建时间
+                this.save(medIllSeriousl);
+            }else{
+                medIllSeriousl.setGmtModified(new Date());//记录修改时间
+                this.update(medIllSeriousl,new QueryWrapper<MedIllSeriousl>()
+                        .eq("rec_id", medIllSeriousl.getRecId())
+                        .eq("hospital_id", medIllSeriousl.getHospitalId())
+                        .eq("behospital_code", medIllSeriousl.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedIllSeriousl medIllSeriousl){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedIllSeriousl>()
+                .eq("rec_id", medIllSeriousl.getRecId())
+                .eq("hospital_id", medIllSeriousl.getHospitalId())
+                .eq("behospital_code", medIllSeriousl.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

+ 0 - 33
src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacsde.java

@@ -1,33 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.service.impl.MedIllSeriouslServiceImpl;
-import com.diagbot.util.EntityUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class AMedIllSeriouslFacsde extends MedIllSeriouslServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-
-    public void getColumnZhAndCh(){
-        List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
-        list.forEach(s->{
-            s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
-        });
-
-        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"medIllSeriousl");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-}

+ 49 - 0
src/main/java/com/diagbot/facade/data/AMedPeriodConclusionFacade.java

@@ -1,12 +1,20 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedPeriodConclusion;
 import com.diagbot.service.impl.MedPeriodConclusionServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedAdmissionNoteVO;
+import com.diagbot.vo.data.AMedPeriodConclusionVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -31,4 +39,45 @@ public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
         }
     }
 
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedPeriodConclusionVO medPeriodConclusionVO=(AMedPeriodConclusionVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
+            MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
+            BeanUtils.copyProperties(medPeriodConclusionVO,medPeriodConclusion);
+            medPeriodConclusion.setHospitalId(hospitalId);//医院编码
+
+            medPeriodConclusion.setAuditDate(DateUtil.parseDateTime(medPeriodConclusionVO.getAuditDate()));//审核时间
+            medPeriodConclusion.setRecDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecDate()));//记录时间
+            medPeriodConclusion.setRecordDate(DateUtil.parseDateTime(medPeriodConclusionVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medPeriodConclusion)){
+                medPeriodConclusion.setGmtCreate(new Date());//记录创建时间
+                this.save(medPeriodConclusion);
+            }else{
+                medPeriodConclusion.setGmtModified(new Date());//记录修改时间
+                this.update(medPeriodConclusion,new QueryWrapper<MedPeriodConclusion>()
+                        .eq("rec_id", medPeriodConclusion.getRecId())
+                        .eq("hospital_id", medPeriodConclusion.getHospitalId())
+                        .eq("behospital_code", medPeriodConclusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedPeriodConclusion medPeriodConclusion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedPeriodConclusion>()
+                .eq("rec_id", medPeriodConclusion.getRecId())
+                .eq("hospital_id", medPeriodConclusion.getHospitalId())
+                .eq("behospital_code", medPeriodConclusion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
 }

+ 48 - 0
src/main/java/com/diagbot/facade/data/AMedTransferInNoteFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedTransferInNote;
 import com.diagbot.service.impl.MedTransferInNoteServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedTransferInNoteVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -31,4 +38,45 @@ public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
         }
     }
 
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedTransferInNoteVO medTransferInNoteVO=(AMedTransferInNoteVO) MapUtil.mapToObject(entityMap, AMedTransferInNoteVO.class);
+            MedTransferInNote medTransferInNote=new MedTransferInNote();
+            BeanUtils.copyProperties(medTransferInNoteVO,medTransferInNote);
+            medTransferInNote.setHospitalId(hospitalId);//医院编码
+            medTransferInNote.setTransferInDate(DateUtil.parseDateTime(medTransferInNoteVO.getTransferInDate()));
+            medTransferInNote.setAuditDate(DateUtil.parseDateTime(medTransferInNoteVO.getAuditDate()));//审核时间
+            medTransferInNote.setRecDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecDate()));//记录时间
+            medTransferInNote.setRecordDate(DateUtil.parseDateTime(medTransferInNoteVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medTransferInNote)){
+                medTransferInNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medTransferInNote);
+            }else{
+                medTransferInNote.setGmtModified(new Date());//记录修改时间
+                this.update(medTransferInNote,new QueryWrapper<MedTransferInNote>()
+                        .eq("rec_id", medTransferInNote.getRecId())
+                        .eq("hospital_id", medTransferInNote.getHospitalId())
+                        .eq("behospital_code", medTransferInNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedTransferInNote medTransferInNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedTransferInNote>()
+                .eq("rec_id", medTransferInNote.getRecId())
+                .eq("hospital_id", medTransferInNote.getHospitalId())
+                .eq("behospital_code", medTransferInNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
 }

+ 48 - 0
src/main/java/com/diagbot/facade/data/AMedTransferOutNoteFacade.java

@@ -1,12 +1,19 @@
 package com.diagbot.facade.data;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedTransferOutNote;
 import com.diagbot.service.impl.MedTransferOutNoteServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AMedTransferOutNoteVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -30,4 +37,45 @@ public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
             return;
         }
     }
+
+    public void dealData(Map<String, Object> entityMap,Long hospitalId){
+        try {
+            AMedTransferOutNoteVO medTransferOutNoteVO=(AMedTransferOutNoteVO) MapUtil.mapToObject(entityMap, AMedTransferOutNoteVO.class);
+            MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
+            BeanUtils.copyProperties(medTransferOutNoteVO,medTransferOutNote);
+            medTransferOutNote.setHospitalId(hospitalId);//医院编码
+            medTransferOutNote.setTransferInDate(DateUtil.parseDateTime(medTransferOutNoteVO.getTransferInDate()));
+            medTransferOutNote.setAuditDate(DateUtil.parseDateTime(medTransferOutNoteVO.getAuditDate()));//审核时间
+            medTransferOutNote.setRecDate(DateUtil.parseDateTime(medTransferOutNoteVO.getRecDate()));//记录时间
+            medTransferOutNote.setRecordDate(DateUtil.parseDateTime(medTransferOutNoteVO.getRecordDate()));//病历日期
+
+            //判断数据库中是否存在,不存在insert
+            if(isExist(medTransferOutNote)){
+                medTransferOutNote.setGmtCreate(new Date());//记录创建时间
+                this.save(medTransferOutNote);
+            }else{
+                medTransferOutNote.setGmtModified(new Date());//记录修改时间
+                this.update(medTransferOutNote,new QueryWrapper<MedTransferOutNote>()
+                        .eq("rec_id", medTransferOutNote.getRecId())
+                        .eq("hospital_id", medTransferOutNote.getHospitalId())
+                        .eq("behospital_code", medTransferOutNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+
+    }
+
+    public Boolean isExist(MedTransferOutNote medTransferOutNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<MedTransferOutNote>()
+                .eq("rec_id", medTransferOutNote.getRecId())
+                .eq("hospital_id", medTransferOutNote.getHospitalId())
+                .eq("behospital_code", medTransferOutNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
 }

+ 11 - 1
src/main/java/com/diagbot/facade/data/ColumnFacade.java

@@ -33,6 +33,9 @@ public class ColumnFacade extends ColumnServiceImpl {
     @Autowired
     private AMedFirstRecordFacade aMedFirstRecordFacade;
 
+    @Autowired
+    private AMedPeriodConclusionFacade aMedPeriodConclusionFacade;
+
     @Autowired
     private BasHospitalInfoFacade basHospitalInfoFacade;
 
@@ -106,9 +109,14 @@ public class ColumnFacade extends ColumnServiceImpl {
             });
             //数据解析
             if("入院记录".equals(modelName)){
-                aMedAdmissionNoteFacade.medAdmissionNoteData(entityMap,Long.valueOf(hospitalId));
+                aMedAdmissionNoteFacade.dealData(entityMap,Long.valueOf(hospitalId));
+            }else if("首次病程录".equals(modelName)){
+                aMedPeriodConclusionFacade.dealData(entityMap,Long.valueOf(hospitalId));
+            }else if("".equals(modelName)){
+                aMedBloodResultFacade.dealData(entityMap,Long.valueOf(hospitalId));
             }
 
+
             log.info(modelName+"---- 解析完成!");
         }catch (Exception e){
             log.error(e.getMessage(),e);
@@ -116,5 +124,7 @@ public class ColumnFacade extends ColumnServiceImpl {
 
     }
 
+    @Autowired
+    private AMedBloodResultFacade aMedBloodResultFacade;
 
 }

+ 7 - 1
src/main/java/com/diagbot/mapper/MedDifficultCaseMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.MedDifficultCase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.data.ColumnZhAndChDTO;
+import com.diagbot.entity.MedDifficultCase;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MedDifficultCaseMapper extends BaseMapper<MedDifficultCase> {
 
+    void updateBatchByKey(List<MedDifficultCase> list);
+
+    List<ColumnZhAndChDTO> getColumnZhAndCh();
 }

+ 117 - 0
src/main/java/com/diagbot/vo/data/AMedBloodResultVO.java

@@ -0,0 +1,117 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedBloodResultVO {
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 效果评价
+     */
+    private String transfusionEvaluate;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 136 - 0
src/main/java/com/diagbot/vo/data/AMedBloodTransfusionVO.java

@@ -0,0 +1,136 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedBloodTransfusionVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 输血原因
+     */
+    private String transfusionReason;
+
+    /**
+     * 输注种类、血型、数量
+     */
+    private String transfusionType;
+
+    /**
+     * 输注过程
+     */
+    private String transfusionProcess;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 151 - 0
src/main/java/com/diagbot/vo/data/AMedDifficultCaseVO.java

@@ -0,0 +1,151 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedDifficultCaseVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 讨论日期
+     */
+    private String discussDate;
+
+    /**
+     * 讨论地点
+     */
+    private String discussPlace;
+
+    /**
+     * 主持人姓名及专业技术职务
+     */
+    private String anchorMan;
+
+    /**
+     * 参加人员的姓名及专业技术职务
+     */
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    private String briefHistory;
+
+    /**
+     * 讨论目的
+     */
+    private String discussAim;
+
+    /**
+     * 具体讨论意见
+     */
+    private String discussionOpinions;
+
+    /**
+     * 主持人小结
+     */
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 161 - 0
src/main/java/com/diagbot/vo/data/AMedFirstRecordVO.java

@@ -0,0 +1,161 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedFirstRecordVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 查体
+     */
+    private String vital;
+
+    /**
+     * 辅检
+     */
+    private String assistantExam;
+
+    /**
+     * 病例特点
+     */
+    private String caseCharacter;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊断依据
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 鉴别诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 诊疗计划(方案)
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 121 - 0
src/main/java/com/diagbot/vo/data/AMedIllCriticallyVO.java

@@ -0,0 +1,121 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedIllCriticallyVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private String patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private String doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 121 - 0
src/main/java/com/diagbot/vo/data/AMedIllSeriouslVO.java

@@ -0,0 +1,121 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedIllSeriouslVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private String patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private String doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 151 - 0
src/main/java/com/diagbot/vo/data/AMedPeriodConclusionVO.java

@@ -0,0 +1,151 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedPeriodConclusionVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊治经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 目前情况
+     */
+    private String presentSituation;
+
+    /**
+     * 诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 161 - 0
src/main/java/com/diagbot/vo/data/AMedTransferInNoteVO.java

@@ -0,0 +1,161 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedTransferInNoteVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 转入日期
+     */
+    private String transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 161 - 0
src/main/java/com/diagbot/vo/data/AMedTransferOutNoteVO.java

@@ -0,0 +1,161 @@
+package com.diagbot.vo.data;
+
+import lombok.Data;
+
+@Data
+public class AMedTransferOutNoteVO {
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private String recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 转入日期
+     */
+    private String transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private String recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private String auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+}

+ 17 - 16
src/main/resources/mapper/MedDeathNoteMapper.xml

@@ -40,22 +40,23 @@
                 name = #{item.name},
                 sex = #{item.sex},
                 age = #{item.age},
-                bed_no = #{item.bedNo},
-                dept_name = #{item.deptName},
-                record_date = #{item.recordDate},
-                behospital_date = #{item.behospitalDate},
-                death_date = #{item.deathDate},
-                behospital_situation = #{item.behospitalSituation},
-                tentative_diagnosis = #{item.tentativeDiagnosis},
-                treatment_process = #{item.treatmentProcess},
-                death_reason = #{item.deathReason},
-                death_diagnosis = #{item.deathDiagnosis},
-                rec_doctor = #{item.recDoctor},
-                rec_date = #{item.recDate},
-                audit_doctor = #{item.auditDoctor},
-                audit_date = #{item.auditDate},
-                whole_data = #{item.wholeData},
-                remark = #{item.remark},
+                bed_no= #{item.bedNo},
+                dept_name= #{item.deptName},
+                record_date= #{item.recordDate},
+                discuss_date= #{item.discussDate},
+                discuss_place= #{item.discussPlace},
+                anchor_man= #{item.anchorMan},
+                participant= #{item.participant},
+                brief_history= #{item.briefHistory},
+                discuss_aim= #{item.discussAim},
+                discussion_opinions= #{item.discussionOpinions},
+                anchor_conclusion= #{item.anchorConclusion},
+                rec_doctor= #{item.recDoctor},
+                rec_date= #{item.recDate},
+                audit_doctor= #{item.auditDoctor},
+                audit_date= #{item.auditDate},
+                whole_data= #{item.wholeData},
+                remark= #{item.remark},
                 <if test="item.gmtModified != null">
                     gmt_modified = #{item.gmtModified},
                 </if>

+ 39 - 0
src/main/resources/mapper/MedDifficultCaseMapper.xml

@@ -34,4 +34,43 @@
         <result column="modifier" property="modifier" />
     </resultMap>
 
+    <update id="updateBatchByKey">
+        <foreach collection="list" item="item"  separator=";">
+            update med_difficult_case
+            <set>
+                <result column="name" property="name" />
+                <result column="sex" property="sex" />
+                <result column="age" property="age" />
+                <result column="bed_no" property="bedNo" />
+                <result column="dept_name" property="deptName" />
+                <result column="record_date" property="recordDate" />
+                <result column="discuss_date" property="discussDate" />
+                <result column="discuss_place" property="discussPlace" />
+                <result column="anchor_man" property="anchorMan" />
+                <result column="participant" property="participant" />
+                <result column="brief_history" property="briefHistory" />
+                <result column="discuss_aim" property="discussAim" />
+                <result column="discussion_opinions" property="discussionOpinions" />
+                <result column="anchor_conclusion" property="anchorConclusion" />
+                <result column="rec_doctor" property="recDoctor" />
+                <result column="rec_date" property="recDate" />
+                <result column="audit_doctor" property="auditDoctor" />
+                <result column="audit_date" property="auditDate" />
+                <result column="whole_data" property="wholeData" />
+                <result column="remark" property="remark" />
+                <if test="item.gmtModified != null">
+                    gmt_modified = #{item.gmtModified},
+                </if>
+                <if test="item.modifier != null">
+                    modifier = #{item.modifier},
+                </if>
+            </set>
+            where rec_id = #{item.recId} and hospital_id = #{item.hospitalId} and behospital_code = #{item.behospitalCode}
+        </foreach>
+    </update>
+
+    <select id="getColumnZhAndCh" resultType="com.diagbot.dto.data.ColumnZhAndChDTO">
+        select COLUMN_NAME as en,column_comment as ch from INFORMATION_SCHEMA.Columns where table_name='med_difficult_case'
+    </select>
+
 </mapper>