结构化表名med_替换为str_

doc/023.20200923v1.5.0/qc_initv1.5.0.sql

@@ -18,50 +18,50 @@ CREATE TABLE `med_abnormal_info`  (
 SET FOREIGN_KEY_CHECKS = 1;
 
 
-alter table med_consultation_note alter column is_deleted set default 'N';
-update  med_consultation_note set is_deleted = 'N';
-alter table med_consultation_apply alter column is_deleted set default 'N';
-update  med_consultation_apply set is_deleted = 'N';
-alter table med_consultation_result alter column is_deleted set default 'N';
-update  med_consultation_result set is_deleted = 'N';
-alter table med_admission_note alter column is_deleted set default 'N';
-update  med_admission_note set is_deleted = 'N';
-alter table med_leave_hospital alter column is_deleted set default 'N';
-update  med_leave_hospital set is_deleted = 'N';
-alter table med_crisis_note alter column is_deleted set default 'N';
-update  med_crisis_note set is_deleted = 'N';
-alter table med_operative_note alter column is_deleted set default 'N';
-update  med_operative_note set is_deleted = 'N';
-alter table med_rescue_note alter column is_deleted set default 'N';
-update  med_rescue_note set is_deleted = 'N';
-alter table med_preoperative_discussion alter column is_deleted set default 'N';
-update  med_preoperative_discussion set is_deleted = 'N';
-alter table med_operative_first_record alter column is_deleted set default 'N';
-update  med_operative_first_record set is_deleted = 'N';
-alter table med_ward_record alter column is_deleted set default 'N';
-update  med_ward_record set is_deleted = 'N';
-alter table med_death_discussion alter column is_deleted set default 'N';
-update  med_death_discussion set is_deleted = 'N';
-alter table med_death_note alter column is_deleted set default 'N';
-update  med_death_note set is_deleted = 'N';
-alter table med_difficult_case alter column is_deleted set default 'N';
-update  med_difficult_case set is_deleted = 'N';
-alter table med_ill_critically alter column is_deleted set default 'N';
-update med_ill_critically set is_deleted = 'N';
-alter table med_ill_seriousl alter column is_deleted set default 'N';
-update  med_ill_seriousl set is_deleted = 'N';
-alter table med_transfer_in_note alter column is_deleted set default 'N';
-update  med_transfer_in_note set is_deleted = 'N';
-alter table med_transfer_out_note alter column is_deleted set default 'N';
-update  med_transfer_out_note set is_deleted = 'N';
-alter table med_blood_result alter column is_deleted set default 'N';
-update  med_blood_result set is_deleted = 'N';
-alter table med_blood_transfusion alter column is_deleted set default 'N';
-update  med_blood_transfusion set is_deleted = 'N';
-alter table med_period_conclusion alter column is_deleted set default 'N';
-update  med_period_conclusion set is_deleted = 'N';
-alter table med_first_record alter column is_deleted set default 'N';
-update  med_first_record set is_deleted = 'N';
+alter table str_consultation_note alter column is_deleted set default 'N';
+update  str_consultation_note set is_deleted = 'N';
+alter table str_consultation_apply alter column is_deleted set default 'N';
+update  str_consultation_apply set is_deleted = 'N';
+alter table str_consultation_result alter column is_deleted set default 'N';
+update  str_consultation_result set is_deleted = 'N';
+alter table str_admission_note alter column is_deleted set default 'N';
+update  str_admission_note set is_deleted = 'N';
+alter table str_leave_hospital alter column is_deleted set default 'N';
+update  str_leave_hospital set is_deleted = 'N';
+alter table str_crisis_note alter column is_deleted set default 'N';
+update  str_crisis_note set is_deleted = 'N';
+alter table str_operative_note alter column is_deleted set default 'N';
+update  str_operative_note set is_deleted = 'N';
+alter table str_rescue_note alter column is_deleted set default 'N';
+update  str_rescue_note set is_deleted = 'N';
+alter table str_preoperative_discussion alter column is_deleted set default 'N';
+update  str_preoperative_discussion set is_deleted = 'N';
+alter table str_operative_first_record alter column is_deleted set default 'N';
+update  str_operative_first_record set is_deleted = 'N';
+alter table str_ward_record alter column is_deleted set default 'N';
+update  str_ward_record set is_deleted = 'N';
+alter table str_death_discussion alter column is_deleted set default 'N';
+update  str_death_discussion set is_deleted = 'N';
+alter table str_death_note alter column is_deleted set default 'N';
+update  str_death_note set is_deleted = 'N';
+alter table str_difficult_case alter column is_deleted set default 'N';
+update  str_difficult_case set is_deleted = 'N';
+alter table str_ill_critically alter column is_deleted set default 'N';
+update str_ill_critically set is_deleted = 'N';
+alter table str_ill_seriousl alter column is_deleted set default 'N';
+update  str_ill_seriousl set is_deleted = 'N';
+alter table str_transfer_in_note alter column is_deleted set default 'N';
+update  str_transfer_in_note set is_deleted = 'N';
+alter table str_transfer_out_note alter column is_deleted set default 'N';
+update  str_transfer_out_note set is_deleted = 'N';
+alter table str_blood_result alter column is_deleted set default 'N';
+update  str_blood_result set is_deleted = 'N';
+alter table str_blood_transfusion alter column is_deleted set default 'N';
+update  str_blood_transfusion set is_deleted = 'N';
+alter table str_period_conclusion alter column is_deleted set default 'N';
+update  str_period_conclusion set is_deleted = 'N';
+alter table str_first_record alter column is_deleted set default 'N';
+update  str_first_record set is_deleted = 'N';
 
 
 

src/main/java/com/diagbot/entity/MedAdmissionNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedAdmissionNote implements Serializable {
+public class StrAdmissionNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -738,7 +738,7 @@ public class MedAdmissionNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedAdmissionNote{" +
+        return "StrAdmissionNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedBloodResult.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedBloodResult implements Serializable {
+public class StrBloodResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -282,7 +282,7 @@ public class MedBloodResult implements Serializable {
 
     @Override
     public String toString() {
-        return "MedBloodResult{" +
+        return "StrBloodResult{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedBloodTransfusion.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedBloodTransfusion implements Serializable {
+public class StrBloodTransfusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -330,7 +330,7 @@ public class MedBloodTransfusion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedBloodTransfusion{" +
+        return "StrBloodTransfusion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedConsultationApply.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedConsultationApply implements Serializable {
+public class StrConsultationApply implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -426,7 +426,7 @@ public class MedConsultationApply implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationApply{" +
+        return "StrConsultationApply{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedConsultationNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedConsultationNote implements Serializable {
+public class StrConsultationNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -426,7 +426,7 @@ public class MedConsultationNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationNote{" +
+        return "StrConsultationNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedConsultationRecord.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @author zhoutg
  * @since 2020-11-13
  */
-public class MedConsultationRecord implements Serializable {
+public class StrConsultationRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -427,7 +427,7 @@ public class MedConsultationRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationRecord{" +
+        return "StrConsultationRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedConsultationResult.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedConsultationResult implements Serializable {
+public class StrConsultationResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -402,7 +402,7 @@ public class MedConsultationResult implements Serializable {
 
     @Override
     public String toString() {
-        return "MedConsultationResult{" +
+        return "StrConsultationResult{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedCrisisNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedCrisisNote implements Serializable {
+public class StrCrisisNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -306,7 +306,7 @@ public class MedCrisisNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedCrisisNote{" +
+        return "StrCrisisNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedDeathDiscussion.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedDeathDiscussion implements Serializable {
+public class StrDeathDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -402,7 +402,7 @@ public class MedDeathDiscussion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedDeathDiscussion{" +
+        return "StrDeathDiscussion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedDeathNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedDeathNote implements Serializable {
+public class StrDeathNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -354,7 +354,7 @@ public class MedDeathNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedDeathNote{" +
+        return "StrDeathNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedDifficultCase.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedDifficultCase implements Serializable {
+public class StrDifficultCase implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -366,7 +366,7 @@ public class MedDifficultCase implements Serializable {
 
     @Override
     public String toString() {
-        return "MedDifficultCase{" +
+        return "StrDifficultCase{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedFirstRecord.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedFirstRecord implements Serializable {
+public class StrFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -390,7 +390,7 @@ public class MedFirstRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedFirstRecord{" +
+        return "StrFirstRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedIllCritically.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedIllCritically implements Serializable {
+public class StrIllCritically implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -294,7 +294,7 @@ public class MedIllCritically implements Serializable {
 
     @Override
     public String toString() {
-        return "MedIllCritically{" +
+        return "StrIllCritically{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedIllSeriousl.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedIllSeriousl implements Serializable {
+public class StrIllSeriousl implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -294,7 +294,7 @@ public class MedIllSeriousl implements Serializable {
 
     @Override
     public String toString() {
-        return "MedIllSeriousl{" +
+        return "StrIllSeriousl{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedLeaveHospital.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedLeaveHospital implements Serializable {
+public class StrLeaveHospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -390,7 +390,7 @@ public class MedLeaveHospital implements Serializable {
 
     @Override
     public String toString() {
-        return "MedLeaveHospital{" +
+        return "StrLeaveHospital{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedOperativeFirstRecord.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedOperativeFirstRecord implements Serializable {
+public class StrOperativeFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -486,7 +486,7 @@ public class MedOperativeFirstRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedOperativeFirstRecord{" +
+        return "StrOperativeFirstRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedOperativeNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedOperativeNote implements Serializable {
+public class StrOperativeNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -498,7 +498,7 @@ public class MedOperativeNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedOperativeNote{" +
+        return "StrOperativeNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedPeriodConclusion.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedPeriodConclusion implements Serializable {
+public class StrPeriodConclusion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -366,7 +366,7 @@ public class MedPeriodConclusion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedPeriodConclusion{" +
+        return "StrPeriodConclusion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedPreoperativeDiscussion.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedPreoperativeDiscussion implements Serializable {
+public class StrPreoperativeDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -426,7 +426,7 @@ public class MedPreoperativeDiscussion implements Serializable {
 
     @Override
     public String toString() {
-        return "MedPreoperativeDiscussion{" +
+        return "StrPreoperativeDiscussion{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedRescueNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedRescueNote implements Serializable {
+public class StrRescueNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -330,7 +330,7 @@ public class MedRescueNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedRescueNote{" +
+        return "StrRescueNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedTransferInNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedTransferInNote implements Serializable {
+public class StrTransferInNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -390,7 +390,7 @@ public class MedTransferInNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedTransferInNote{" +
+        return "StrTransferInNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedTransferOutNote.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedTransferOutNote implements Serializable {
+public class StrTransferOutNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -390,7 +390,7 @@ public class MedTransferOutNote implements Serializable {
 
     @Override
     public String toString() {
-        return "MedTransferOutNote{" +
+        return "StrTransferOutNote{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/entity/MedWardRecord.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * @author cy
  * @since 2020-10-09
  */
-public class MedWardRecord implements Serializable {
+public class StrWardRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -354,7 +354,7 @@ public class MedWardRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "MedWardRecord{" +
+        return "StrWardRecord{" +
             "recId=" + recId +
             ", hospitalId=" + hospitalId +
             ", behospitalCode=" + behospitalCode +

src/main/java/com/diagbot/enums/CacheKeyEnum.java

@@ -3,31 +3,31 @@ 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"),
-    ILL_CRITICALLY("病危通知书", "medIllCritically"),
-    ILL_SERIOUSL("病重通知书", "medIllSeriousl"),
-    DIFFICULT_CASE("疑难病例讨论记录", "medDifficultCase"),
-    DEATH_NOTE("死亡记录", "medDeathNote"),
-    DEATH_DISCUSSION("死亡病例讨论记录", "medDeathDiscussion"),
-    WARD_RECORD("查房记录", "medWardRecord"),
-    OPERATIVE_FIRST_RECORD("术后首次病程及谈话记录", "medOperativeFirstRecord"),
-    PREOPERATIVE_DISCUSSION("术前讨论、术前小结", "medPreoperativeDiscussion"),
-    OPERATIVE_NOTE("手术记录", "medOperativeNote"),
-    RESCUE_NOTE("抢救记录", "medRescueNote"),
-    CRISIS_NOTE("危急值记录", "medCrisisNote"),
-    LEAVE_HOSPITAL("出院小结", "medLeaveHospital"),
-    CONSULTATION_APPLY("会诊申请单", "medConsultationApply"),
-    CONSULTATION_RESULT("会诊结果单", "medConsultationResult"),
-    CONSULTATION_NOTE("会诊单", "medConsultationNote"),
-    CONSULTATION_RECORD("会诊记录","medConsultationRecord");
+    BEHOSPITAL_INFO("入院记录", "strAdmissionNote"),
+    BLOOD_RESULT("输血后效果评价", "strBloodResult"),
+    BLOOD_TRANSFUSION("输血/血制品病程记录", "strBloodTransfusion"),
+    PERIOD_CONCLUSION("阶段小结", "strPeriodConclusion"),
+    FIRST_RECORD("首次病程录","strFirstRecord"),
+    TRANSFER_IN_NOTE("转入记录", "strTransferInNote"),
+    TRANSFER_OUT_NOTE("转出记录", "strTransferOutNote"),
+    ILL_CRITICALLY("病危通知书", "strIllCritically"),
+    ILL_SERIOUSL("病重通知书", "strIllSeriousl"),
+    DIFFICULT_CASE("疑难病例讨论记录", "strDifficultCase"),
+    DEATH_NOTE("死亡记录", "strDeathNote"),
+    DEATH_DISCUSSION("死亡病例讨论记录", "strDeathDiscussion"),
+    WARD_RECORD("查房记录", "strWardRecord"),
+    OPERATIVE_FIRST_RECORD("术后首次病程及谈话记录", "strOperativeFirstRecord"),
+    PREOPERATIVE_DISCUSSION("术前讨论、术前小结", "strPreoperativeDiscussion"),
+    OPERATIVE_NOTE("手术记录", "strOperativeNote"),
+    RESCUE_NOTE("抢救记录", "strRescueNote"),
+    CRISIS_NOTE("危急值记录", "strCrisisNote"),
+    LEAVE_HOSPITAL("出院小结", "strLeaveHospital"),
+    CONSULTATION_APPLY("会诊申请单", "strConsultationApply"),
+    CONSULTATION_RESULT("会诊结果单", "strConsultationResult"),
+    CONSULTATION_NOTE("会诊单", "strConsultationNote"),
+    CONSULTATION_RECORD("会诊记录","strConsultationRecord");
     /*
-    FIRST_RECORD(2, "aMedFirstRecordFacade"),
+    FIRST_RECORD(2, "aStrFirstRecordFacade"),
     HOME_PAGE(6, "病案首页"),
             (8, "医嘱信息"),
             (9, "交接班记录"),

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -110,51 +110,51 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     MedCheckInfoFacade medCheckInfoFacade;
     @Autowired
-    MedConsultationApplyFacade medConsultationApplyFacade;
+    StrConsultationApplyFacade strConsultationApplyFacade;
     @Autowired
-    MedConsultationResultFacade medConsultationResultFacade;
+    StrConsultationResultFacade strConsultationResultFacade;
     @Autowired
-    MedConsultationNoteFacade medConsultationNoteFacade;
+    StrConsultationNoteFacade strConsultationNoteFacade;
     @Autowired
-    MedConsultationRecordFacade medConsultationRecordFacade;
+    StrConsultationRecordFacade strConsultationRecordFacade;
     @Autowired
-    MedAdmissionNoteFacade medAdmissionNoteFacade;
+    StrAdmissionNoteFacade strAdmissionNoteFacade;
     @Autowired
-    MedBloodResultFacade medBloodResultFacade;
+    StrBloodResultFacade strBloodResultFacade;
     @Autowired
-    MedBloodTransfusionFacade medBloodTransfusionFacade;
+    StrBloodTransfusionFacade strBloodTransfusionFacade;
     @Autowired
-    MedCrisisNoteFacade medCrisisNoteFacade;
+    StrCrisisNoteFacade strCrisisNoteFacade;
     @Autowired
-    MedDeathDiscussionFacade medDeathDiscussionFacade;
+    StrDeathDiscussionFacade strDeathDiscussionFacade;
     @Autowired
-    MedDeathNoteFacade medDeathNoteFacade;
+    StrDeathNoteFacade strDeathNoteFacade;
     @Autowired
-    MedDifficultCaseFacade medDifficultCaseFacade;
+    StrDifficultCaseFacade strDifficultCaseFacade;
     @Autowired
-    MedFirstRecordFacade medFirstRecordFacade;
+    StrFirstRecordFacade strFirstRecordFacade;
     @Autowired
-    MedIllCriticallyFacade medIllCriticallyFacade;
+    StrIllCriticallyFacade strIllCriticallyFacade;
     @Autowired
-    MedIllSeriouslFacade medIllSeriouslFacade;
+    StrIllSeriouslFacade strIllSeriouslFacade;
     @Autowired
-    MedLeaveHospitalFacade medLeaveHospitalFacade;
+    StrLeaveHospitalFacade strLeaveHospitalFacade;
     @Autowired
-    MedOperativeFirstRecordFacade medOperativeFirstRecordFacade;
+    StrOperativeFirstRecordFacade strOperativeFirstRecordFacade;
     @Autowired
-    MedOperativeNoteFacade medOperativeNoteFacade;
+    StrOperativeNoteFacade strOperativeNoteFacade;
     @Autowired
-    MedPeriodConclusionFacade medPeriodConclusionFacade;
+    StrPeriodConclusionFacade strPeriodConclusionFacade;
     @Autowired
-    MedPreoperativeDiscussionFacade medPreoperativeDiscussionFacade;
+    StrPreoperativeDiscussionFacade strPreoperativeDiscussionFacade;
     @Autowired
-    MedRescueNoteFacade medRescueNoteFacade;
+    StrRescueNoteFacade strRescueNoteFacade;
     @Autowired
-    MedTransferInNoteFacade medTransferInNoteFacade;
+    StrTransferInNoteFacade strTransferInNoteFacade;
     @Autowired
-    MedTransferOutNoteFacade medTransferOutNoteFacade;
+    StrTransferOutNoteFacade strTransferOutNoteFacade;
     @Autowired
-    MedWardRecordFacade medWardRecordFacade;
+    StrWardRecordFacade strWardRecordFacade;
 
 
     /**
@@ -307,7 +307,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         Map<String, List<RecordContentDTO>> recMap = EntityUtil.makeEntityListMap(recordContentDTOList, "standModelName");
 //        -------------------------------------文书数据改造开始----------------------------------
         // 获取会诊申请单
-        List<MedConsultationApply> medConsultationApplyList = medConsultationApplyFacade.list(new QueryWrapper<MedConsultationApply>()
+        List<StrConsultationApply> strConsultationApplyList = strConsultationApplyFacade.list(new QueryWrapper<StrConsultationApply>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -316,7 +316,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 获取会诊结果单
-        List<MedConsultationResult> medConsultationResultList = medConsultationResultFacade.list(new QueryWrapper<MedConsultationResult>()
+        List<StrConsultationResult> strConsultationResultList = strConsultationResultFacade.list(new QueryWrapper<StrConsultationResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -325,7 +325,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 会诊单（申请和结果）
-        List<MedConsultationNote> medConsultationNoteList = medConsultationNoteFacade.list(new QueryWrapper<MedConsultationNote>()
+        List<StrConsultationNote> strConsultationNoteList = strConsultationNoteFacade.list(new QueryWrapper<StrConsultationNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -334,7 +334,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 会诊记录
-        List<MedConsultationRecord> medConsultationRecordList = medConsultationRecordFacade.list(new QueryWrapper<MedConsultationRecord>()
+        List<StrConsultationRecord> strConsultationRecordList = strConsultationRecordFacade.list(new QueryWrapper<StrConsultationRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -343,7 +343,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 入院记录
-        List<MedAdmissionNote> medAdmissionNoteList = medAdmissionNoteFacade.list(new QueryWrapper<MedAdmissionNote>()
+        List<StrAdmissionNote> strAdmissionNoteList = strAdmissionNoteFacade.list(new QueryWrapper<StrAdmissionNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -353,7 +353,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 输血效果评价
-        List<MedBloodResult> medBloodResultList = medBloodResultFacade.list(new QueryWrapper<MedBloodResult>()
+        List<StrBloodResult> strBloodResultList = strBloodResultFacade.list(new QueryWrapper<StrBloodResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -362,7 +362,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 输血记录
-        List<MedBloodTransfusion> medBloodTransfusionList = medBloodTransfusionFacade.list(new QueryWrapper<MedBloodTransfusion>()
+        List<StrBloodTransfusion> strBloodTransfusionList = strBloodTransfusionFacade.list(new QueryWrapper<StrBloodTransfusion>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -371,7 +371,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 危急值记录
-        List<MedCrisisNote> medCrisisNoteList = medCrisisNoteFacade.list(new QueryWrapper<MedCrisisNote>()
+        List<StrCrisisNote> strCrisisNoteList = strCrisisNoteFacade.list(new QueryWrapper<StrCrisisNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -380,7 +380,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 死亡病例讨论记录
-        List<MedDeathDiscussion> medDeathDiscussionList = medDeathDiscussionFacade.list(new QueryWrapper<MedDeathDiscussion>()
+        List<StrDeathDiscussion> strDeathDiscussionList = strDeathDiscussionFacade.list(new QueryWrapper<StrDeathDiscussion>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -389,7 +389,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 死亡记录
-        List<MedDeathNote> medDeathNoteList = medDeathNoteFacade.list(new QueryWrapper<MedDeathNote>()
+        List<StrDeathNote> strDeathNoteList = strDeathNoteFacade.list(new QueryWrapper<StrDeathNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -398,7 +398,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 疑难病例讨论记录
-        List<MedDifficultCase> medDifficultCaseList = medDifficultCaseFacade.list(new QueryWrapper<MedDifficultCase>()
+        List<StrDifficultCase> strDifficultCaseList = strDifficultCaseFacade.list(new QueryWrapper<StrDifficultCase>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -407,7 +407,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 首次病程录
-        List<MedFirstRecord> medFirstRecordList = medFirstRecordFacade.list(new QueryWrapper<MedFirstRecord>()
+        List<StrFirstRecord> strFirstRecordList = strFirstRecordFacade.list(new QueryWrapper<StrFirstRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -416,7 +416,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 病危通知单
-        List<MedIllCritically> medIllCriticallyList = medIllCriticallyFacade.list(new QueryWrapper<MedIllCritically>()
+        List<StrIllCritically> strIllCriticallyList = strIllCriticallyFacade.list(new QueryWrapper<StrIllCritically>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -425,7 +425,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 病重通知单
-        List<MedIllSeriousl> medIllSeriouslList = medIllSeriouslFacade.list(new QueryWrapper<MedIllSeriousl>()
+        List<StrIllSeriousl> strIllSeriouslList = strIllSeriouslFacade.list(new QueryWrapper<StrIllSeriousl>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -434,7 +434,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 出院小结
-        List<MedLeaveHospital> medLeaveHospitalList = medLeaveHospitalFacade.list(new QueryWrapper<MedLeaveHospital>()
+        List<StrLeaveHospital> strLeaveHospitalList = strLeaveHospitalFacade.list(new QueryWrapper<StrLeaveHospital>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -443,7 +443,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 术后首程
-        List<MedOperativeFirstRecord> medOperativeFirstRecordList = medOperativeFirstRecordFacade.list(new QueryWrapper<MedOperativeFirstRecord>()
+        List<StrOperativeFirstRecord> strOperativeFirstRecordList = strOperativeFirstRecordFacade.list(new QueryWrapper<StrOperativeFirstRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -452,7 +452,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 手术记录
-        List<MedOperativeNote> medOperativeNoteList = medOperativeNoteFacade.list(new QueryWrapper<MedOperativeNote>()
+        List<StrOperativeNote> strOperativeNoteList = strOperativeNoteFacade.list(new QueryWrapper<StrOperativeNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -461,7 +461,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 阶段小结
-        List<MedPeriodConclusion> medPeriodConclusionList = medPeriodConclusionFacade.list(new QueryWrapper<MedPeriodConclusion>()
+        List<StrPeriodConclusion> strPeriodConclusionList = strPeriodConclusionFacade.list(new QueryWrapper<StrPeriodConclusion>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -470,7 +470,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 术前讨论小结
-        List<MedPreoperativeDiscussion> medPreoperativeDiscussionList = medPreoperativeDiscussionFacade.list(new QueryWrapper<MedPreoperativeDiscussion>()
+        List<StrPreoperativeDiscussion> strPreoperativeDiscussionList = strPreoperativeDiscussionFacade.list(new QueryWrapper<StrPreoperativeDiscussion>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -479,7 +479,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 抢救记录
-        List<MedRescueNote> medRescueNoteList = medRescueNoteFacade.list(new QueryWrapper<MedRescueNote>()
+        List<StrRescueNote> strRescueNoteList = strRescueNoteFacade.list(new QueryWrapper<StrRescueNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -488,7 +488,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 转入记录
-        List<MedTransferInNote> medTransferInNoteList = medTransferInNoteFacade.list(new QueryWrapper<MedTransferInNote>()
+        List<StrTransferInNote> strTransferInNoteList = strTransferInNoteFacade.list(new QueryWrapper<StrTransferInNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -497,7 +497,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 转出记录
-        List<MedTransferOutNote> medTransferOutNoteList = medTransferOutNoteFacade.list(new QueryWrapper<MedTransferOutNote>()
+        List<StrTransferOutNote> strTransferOutNoteList = strTransferOutNoteFacade.list(new QueryWrapper<StrTransferOutNote>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -506,7 +506,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         );
 
         // 查房记录
-        List<MedWardRecord> medWardRecordList = medWardRecordFacade.list(new QueryWrapper<MedWardRecord>()
+        List<StrWardRecord> strWardRecordList = strWardRecordFacade.list(new QueryWrapper<StrWardRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
@@ -607,136 +607,136 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
          */
 
         // 会诊记录
-        if (ListUtil.isNotEmpty(medConsultationRecordList)) {
-            specialData("会诊", medConsultationRecordList, recMap, medrecVoList, "会诊记录");
+        if (ListUtil.isNotEmpty(strConsultationRecordList)) {
+            specialData("会诊", strConsultationRecordList, recMap, medrecVoList, "会诊记录");
         } else {
             specialDataWithKey("会诊", recMap, medrecVoList, "会诊记录",
                     Arrays.asList("会诊记录"));
         }
 
         //会诊申请单
-        if (ListUtil.isNotEmpty(medConsultationApplyList)) {
-            specialData("会诊", medConsultationApplyList, recMap, medrecVoList, "会诊申请单");
+        if (ListUtil.isNotEmpty(strConsultationApplyList)) {
+            specialData("会诊", strConsultationApplyList, recMap, medrecVoList, "会诊申请单");
         } else {
             specialDataWithKey("会诊", recMap, medrecVoList, "会诊申请单",
                     Arrays.asList("会诊申请单"));
         }
         //会诊结果单
-        if (ListUtil.isNotEmpty(medConsultationResultList)) {
-            specialData("会诊", medConsultationResultList, recMap, medrecVoList, "会诊结果单");
+        if (ListUtil.isNotEmpty(strConsultationResultList)) {
+            specialData("会诊", strConsultationResultList, recMap, medrecVoList, "会诊结果单");
         } else {
             specialDataWithKey("会诊", recMap, medrecVoList, "会诊结果单",
                     Arrays.asList("会诊记录", "会诊结果单", "会诊申请单"));
         }
 
         //会诊单（申请和结果）
-        if (ListUtil.isNotEmpty(medConsultationNoteList)) {
-            specialData("会诊", medConsultationNoteList, recMap, medrecVoList, "会诊单（申请和结果）");
+        if (ListUtil.isNotEmpty(strConsultationNoteList)) {
+            specialData("会诊", strConsultationNoteList, recMap, medrecVoList, "会诊单（申请和结果）");
         }
         //入院记录
-        if (ListUtil.isNotEmpty(medAdmissionNoteList)) {
-            newAddData("入院记录", medAdmissionNoteList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strAdmissionNoteList)) {
+            newAddData("入院记录", strAdmissionNoteList, recMap, medrecVoList);
         } else {
             addData("入院记录", recMap, medrecVoList);
         }
 
         //输血效果评价
-        if (ListUtil.isNotEmpty(medBloodResultList)) {
-            newAddData("输血后效果评价", medBloodResultList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strBloodResultList)) {
+            newAddData("输血后效果评价", strBloodResultList, recMap, medrecVoList);
         } else {
             addData("输血后效果评价", recMap, medrecVoList);
         }
 
         //输血记录
-        if (ListUtil.isNotEmpty(medBloodTransfusionList)) {
-            newAddData("输血/血制品病程记录", medBloodTransfusionList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strBloodTransfusionList)) {
+            newAddData("输血/血制品病程记录", strBloodTransfusionList, recMap, medrecVoList);
         } else {
             addData("输血/血制品病程记录", recMap, medrecVoList);
         }
 
 
         //危急值记录
-        if (ListUtil.isNotEmpty(medCrisisNoteList)) {
-            newAddData("危急值记录", medCrisisNoteList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strCrisisNoteList)) {
+            newAddData("危急值记录", strCrisisNoteList, recMap, medrecVoList);
         } else {
             addData("危急值记录", recMap, medrecVoList);
         }
 
         //死亡病例讨论记录
-        if (ListUtil.isNotEmpty(medDeathDiscussionList)) {
-            newAddData("死亡病例讨论记录", medDeathDiscussionList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strDeathDiscussionList)) {
+            newAddData("死亡病例讨论记录", strDeathDiscussionList, recMap, medrecVoList);
         } else {
             addData("死亡病例讨论记录", recMap, medrecVoList);
         }
 
         //死亡记录
-        if (ListUtil.isNotEmpty(medDeathNoteList)) {
-            newAddData("死亡记录", medDeathNoteList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strDeathNoteList)) {
+            newAddData("死亡记录", strDeathNoteList, recMap, medrecVoList);
         } else {
             addData("死亡记录", recMap, medrecVoList);
         }
 
         //疑难病例讨论记录
-        if (ListUtil.isNotEmpty(medDifficultCaseList)) {
-            newAddData("疑难病例讨论记录", medDifficultCaseList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strDifficultCaseList)) {
+            newAddData("疑难病例讨论记录", strDifficultCaseList, recMap, medrecVoList);
         } else {
             addData("疑难病例讨论记录", recMap, medrecVoList);
         }
 
         //首次病程录
-        if (ListUtil.isNotEmpty(medFirstRecordList)) {
-            newAddData("首次病程录", medFirstRecordList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strFirstRecordList)) {
+            newAddData("首次病程录", strFirstRecordList, recMap, medrecVoList);
         } else {
             addData("首次病程录", recMap, medrecVoList);
         }
 
         //病危通知单
-        if (ListUtil.isNotEmpty(medIllCriticallyList)) {
-            newAddData("病危通知书", medIllCriticallyList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strIllCriticallyList)) {
+            newAddData("病危通知书", strIllCriticallyList, recMap, medrecVoList);
         } else {
             addData("病危通知书", recMap, medrecVoList);
         }
 
         //病重通知单
-        if (ListUtil.isNotEmpty(medIllSeriouslList)) {
-            newAddData("病重通知书", medIllSeriouslList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strIllSeriouslList)) {
+            newAddData("病重通知书", strIllSeriouslList, recMap, medrecVoList);
         } else {
             addData("病重通知书", recMap, medrecVoList);
         }
 
         //出院小结
-        if (ListUtil.isNotEmpty(medLeaveHospitalList)) {
-            newAddData("出院小结", medLeaveHospitalList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strLeaveHospitalList)) {
+            newAddData("出院小结", strLeaveHospitalList, recMap, medrecVoList);
         } else {
             addData("出院小结", recMap, medrecVoList);
         }
 
         //术后首程
-        if (ListUtil.isNotEmpty(medOperativeFirstRecordList)) {
-            specialData("手术", medOperativeFirstRecordList, recMap, medrecVoList, "术后首次病程及谈话记录");
+        if (ListUtil.isNotEmpty(strOperativeFirstRecordList)) {
+            specialData("手术", strOperativeFirstRecordList, recMap, medrecVoList, "术后首次病程及谈话记录");
         } else {
             specialDataWithKey("手术", recMap, medrecVoList, "术后首次病程及谈话记录",
                     null);
         }
 
         //手术记录
-        if (ListUtil.isNotEmpty(medOperativeNoteList)) {
-            specialData("手术", medOperativeNoteList, recMap, medrecVoList, "手术记录");
+        if (ListUtil.isNotEmpty(strOperativeNoteList)) {
+            specialData("手术", strOperativeNoteList, recMap, medrecVoList, "手术记录");
         } else {
             specialDataWithKey("手术", recMap, medrecVoList, "手术记录",
                     null);
         }
 
         //阶段小结
-        if (ListUtil.isNotEmpty(medPeriodConclusionList)) {
-            newAddData("阶段小结", medPeriodConclusionList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strPeriodConclusionList)) {
+            newAddData("阶段小结", strPeriodConclusionList, recMap, medrecVoList);
         } else {
             addData("阶段小结", recMap, medrecVoList);
         }
 
         //术前讨论小结
-        if (ListUtil.isNotEmpty(medPreoperativeDiscussionList)) {
-            specialData("手术", medPreoperativeDiscussionList, recMap, medrecVoList, "术前讨论、术前小结");
+        if (ListUtil.isNotEmpty(strPreoperativeDiscussionList)) {
+            specialData("手术", strPreoperativeDiscussionList, recMap, medrecVoList, "术前讨论、术前小结");
         } else {
             specialDataWithKey("手术", recMap, medrecVoList, "术前讨论、术前小结",
                     null);
@@ -744,31 +744,31 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
 
         //抢救记录
-        if (ListUtil.isNotEmpty(medRescueNoteList)) {
-            newAddData("抢救记录", medRescueNoteList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strRescueNoteList)) {
+            newAddData("抢救记录", strRescueNoteList, recMap, medrecVoList);
         } else {
             addData("抢救记录", recMap, medrecVoList);
         }
 
         //转入记录
-        if (ListUtil.isNotEmpty(medTransferInNoteList)) {
-            specialData("转科", medTransferInNoteList, recMap, medrecVoList, "转入记录");
+        if (ListUtil.isNotEmpty(strTransferInNoteList)) {
+            specialData("转科", strTransferInNoteList, recMap, medrecVoList, "转入记录");
         } else {
             specialDataWithKey("转科", recMap, medrecVoList, "转入记录",
                     null);
         }
 
         //转出记录
-        if (ListUtil.isNotEmpty(medTransferOutNoteList)) {
-            specialData("转科", medTransferOutNoteList, recMap, medrecVoList, "转出记录");
+        if (ListUtil.isNotEmpty(strTransferOutNoteList)) {
+            specialData("转科", strTransferOutNoteList, recMap, medrecVoList, "转出记录");
         } else {
             specialDataWithKey("转科", recMap, medrecVoList, "转出记录",
                     null);
         }
 
         //查房记录
-        if (ListUtil.isNotEmpty(medWardRecordList)) {
-            newAddData("查房记录", medWardRecordList, recMap, medrecVoList);
+        if (ListUtil.isNotEmpty(strWardRecordList)) {
+            newAddData("查房记录", strWardRecordList, recMap, medrecVoList);
         } else {
             addData("查房记录", recMap, medrecVoList);
         }

src/main/java/com/diagbot/facade/MedBloodTransfusionFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedConsultationApplyFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedConsultationNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedConsultationRecordFacade.java

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

src/main/java/com/diagbot/facade/MedConsultationResultFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedCrisisNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedDeathDiscussionFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedDeathNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedDifficultCaseFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedFirstRecordFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedIllCriticallyFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedIllSeriouslFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedLeaveHospitalFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedOperativeFirstRecordFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedOperativeNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedPeriodConclusionFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedRescueNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedTransferInNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedTransferOutNoteFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedWardRecordFacade.java

@@ -1,14 +0,0 @@
-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 {
-}

src/main/java/com/diagbot/facade/MedAdmissionNoteFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
+import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Component;
  * @time: 2020/9/23 11:39
  */
 @Component
-public class MedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
+public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
 }

src/main/java/com/diagbot/facade/MedBloodResultFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.MedBloodResultServiceImpl;
+import com.diagbot.service.impl.StrBloodResultServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Component;
  * @time: 2020/9/23 11:39
  */
 @Component
-public class MedBloodResultFacade extends MedBloodResultServiceImpl {
+public class StrBloodResultFacade extends StrBloodResultServiceImpl {
 }

src/main/java/com/diagbot/facade/StrBloodTransfusionFacade.java

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

src/main/java/com/diagbot/facade/StrConsultationApplyFacade.java

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

src/main/java/com/diagbot/facade/StrConsultationNoteFacade.java

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

src/main/java/com/diagbot/facade/StrConsultationRecordFacade.java

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

src/main/java/com/diagbot/facade/StrConsultationResultFacade.java

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

src/main/java/com/diagbot/facade/StrCrisisNoteFacade.java

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

src/main/java/com/diagbot/facade/StrDeathDiscussionFacade.java

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

src/main/java/com/diagbot/facade/StrDeathNoteFacade.java

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

src/main/java/com/diagbot/facade/StrDifficultCaseFacade.java

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

src/main/java/com/diagbot/facade/StrFirstRecordFacade.java

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

src/main/java/com/diagbot/facade/StrIllCriticallyFacade.java

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

src/main/java/com/diagbot/facade/StrIllSeriouslFacade.java

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

src/main/java/com/diagbot/facade/StrLeaveHospitalFacade.java

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

src/main/java/com/diagbot/facade/StrOperativeFirstRecordFacade.java

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

src/main/java/com/diagbot/facade/StrOperativeNoteFacade.java

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

src/main/java/com/diagbot/facade/StrPeriodConclusionFacade.java

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

src/main/java/com/diagbot/facade/MedPreoperativeDiscussionFacade.java

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.service.impl.MedPreoperativeDiscussionServiceImpl;
+import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,5 +9,5 @@ import org.springframework.stereotype.Component;
  * @time: 2020/9/23 11:39
  */
 @Component
-public class MedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionServiceImpl {
+public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionServiceImpl {
 }

src/main/java/com/diagbot/facade/StrRescueNoteFacade.java

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

src/main/java/com/diagbot/facade/StrTransferInNoteFacade.java

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

src/main/java/com/diagbot/facade/StrTransferOutNoteFacade.java

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

src/main/java/com/diagbot/facade/StrWardRecordFacade.java

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

src/main/java/com/diagbot/facade/data/AMedAdmissionNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedAdmissionNote;
-import com.diagbot.service.impl.MedAdmissionNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedAdmissionNoteVO;
-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 AMedAdmissionNoteFacade extends MedAdmissionNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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, "medAdmissionNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medAdmissionNote");
-        if (!flag) {
-            return;
-        }
-    }
-
-    //入院记录
-    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
-        MedAdmissionNote medAdmissionNote = new MedAdmissionNote();
-        try {
-            AMedAdmissionNoteVO medAdmissionNoteVO = (AMedAdmissionNoteVO) MapUtil.mapToObject(entityMap, AMedAdmissionNoteVO.class);
-            BeanUtils.copyProperties(medAdmissionNoteVO, medAdmissionNote);
-            medAdmissionNote.setHospitalId(hospitalId);//医院编码
-
-            medAdmissionNote.setAuditDate(DateUtil.parseDateTime(medAdmissionNoteVO.getAuditDate()));//审核时间
-            medAdmissionNote.setRecDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecDate()));//记录时间
-            medAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(medAdmissionNoteVO.getBehospitalDate()));//入院日期
-            medAdmissionNote.setBirthday(DateUtil.parseDate(medAdmissionNoteVO.getBirthday()));//出生日期
-            medAdmissionNote.setRecordDate(DateUtil.parseDateTime(medAdmissionNoteVO.getRecordDate()));//病历日期
-
-            medAdmissionNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if (isExist(medAdmissionNote)) {
-                medAdmissionNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medAdmissionNote);
-            } else {
-                medAdmissionNote.setGmtModified(new Date());//记录修改时间
-                this.update(medAdmissionNote, new QueryWrapper<MedAdmissionNote>()
-                        .eq("rec_id", medAdmissionNote.getRecId())
-                        .eq("hospital_id", medAdmissionNote.getHospitalId())
-                        .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", medAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
-        }
-    }
-
-    public Boolean isExist(MedAdmissionNote medAdmissionNote) {
-        Boolean flag = true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedAdmissionNote>()
-                .eq("rec_id", medAdmissionNote.getRecId())
-                .eq("hospital_id", medAdmissionNote.getHospitalId())
-                .eq("behospital_code", medAdmissionNote.getBehospitalCode()));
-        if (count > 0) {
-            flag = false;
-        }
-        return flag;
-    }
-
-}

src/main/java/com/diagbot/facade/data/AMedBloodTransfusionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-
-@Component
-public class AMedBloodTransfusionFacade extends MedBloodTransfusionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medBloodTransfusion");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedBloodTransfusion medBloodTransfusion=new MedBloodTransfusion();
-        try {
-            AMedBloodTransfusionVO medBloodTransfusionVO=(AMedBloodTransfusionVO) MapUtil.mapToObject(entityMap, AMedBloodTransfusionVO.class);
-            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()));//病历日期
-
-            medBloodTransfusion.setWholeData(columnMap);
-
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", medBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedConsultationApplyFacade.java

@@ -1,89 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedConsultationApply;
-import com.diagbot.service.impl.MedConsultationApplyServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedConsultationApplyVO;
-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 AMedConsultationApplyFacade extends MedConsultationApplyServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medConsultationApply");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊申请单
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedConsultationApply medConsultationApply=new MedConsultationApply();
-        try {
-            AMedConsultationApplyVO medConsultationApplyVO=(AMedConsultationApplyVO) MapUtil.mapToObject(entityMap, AMedConsultationApplyVO.class);
-            BeanUtils.copyProperties(medConsultationApplyVO,medConsultationApply);
-            medConsultationApply.setHospitalId(hospitalId);//医院编码
-
-            medConsultationApply.setAuditDate(DateUtil.parseDateTime(medConsultationApplyVO.getAuditDate()));//审核时间
-            medConsultationApply.setRecDate(DateUtil.parseDateTime(medConsultationApplyVO.getRecDate()));//记录时间
-            medConsultationApply.setBehospitalDate(DateUtil.parseDateTime(medConsultationApplyVO.getBehospitalDate()));//入院日期
-            medConsultationApply.setRecordDate(DateUtil.parseDateTime(medConsultationApplyVO.getRecordDate()));//病历日期
-            medConsultationApply.setApplyDate(DateUtil.parseDateTime(medConsultationApplyVO.getApplyDate()));//申请日期
-            medConsultationApply.setConsultationDate(DateUtil.parseDateTime(medConsultationApplyVO.getConsultationDate()));//会诊时间
-            medConsultationApply.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medConsultationApply)){
-                medConsultationApply.setGmtCreate(new Date());//记录创建时间
-                this.save(medConsultationApply);
-            }else{
-                medConsultationApply.setGmtModified(new Date());//记录修改时间
-                this.update(medConsultationApply,new QueryWrapper<MedConsultationApply>()
-                        .eq("rec_id", medConsultationApply.getRecId())
-                        .eq("hospital_id", medConsultationApply.getHospitalId())
-                        .eq("behospital_code", medConsultationApply.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",medConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedConsultationApply medConsultationApply){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationApply>()
-                .eq("rec_id", medConsultationApply.getRecId())
-                .eq("hospital_id", medConsultationApply.getHospitalId())
-                .eq("behospital_code", medConsultationApply.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

src/main/java/com/diagbot/facade/data/AMedConsultationNoteFacade.java

@@ -1,91 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedConsultationNote;
-import com.diagbot.service.impl.MedConsultationNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedConsultationNoteVO;
-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 AMedConsultationNoteFacade extends MedConsultationNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medConsultationNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊单（申请和结果）
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedConsultationNote medConsultationNote=new MedConsultationNote();
-        try {
-            AMedConsultationNoteVO medConsultationNoteVO=(AMedConsultationNoteVO) MapUtil.mapToObject(entityMap, AMedConsultationNoteVO.class);
-            BeanUtils.copyProperties(medConsultationNoteVO,medConsultationNote);
-            medConsultationNote.setHospitalId(hospitalId);//医院编码
-
-            medConsultationNote.setAuditDate(DateUtil.parseDateTime(medConsultationNoteVO.getAuditDate()));//审核时间
-            medConsultationNote.setRecDate(DateUtil.parseDateTime(medConsultationNoteVO.getRecDate()));//记录时间
-            medConsultationNote.setBehospitalDate(DateUtil.parseDateTime(medConsultationNoteVO.getBehospitalDate()));//入院日期
-            medConsultationNote.setApplyDate(DateUtil.parseDate(medConsultationNoteVO.getApplyDate()));//申请日期
-            medConsultationNote.setRecordDate(DateUtil.parseDateTime(medConsultationNoteVO.getRecordDate()));//病历日期
-            medConsultationNote.setConsultationDate(DateUtil.parseDateTime(medConsultationNoteVO.getConsultationDate()));//会诊时间
-
-            medConsultationNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medConsultationNote)){
-                medConsultationNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medConsultationNote);
-            }else{
-                medConsultationNote.setGmtModified(new Date());//记录修改时间
-                this.update(medConsultationNote,new QueryWrapper<MedConsultationNote>()
-                        .eq("rec_id", medConsultationNote.getRecId())
-                        .eq("hospital_id", medConsultationNote.getHospitalId())
-                        .eq("behospital_code", medConsultationNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",medConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedConsultationNote medConsultationNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationNote>()
-                .eq("rec_id", medConsultationNote.getRecId())
-                .eq("hospital_id", medConsultationNote.getHospitalId())
-                .eq("behospital_code", medConsultationNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-
-}

src/main/java/com/diagbot/facade/data/AMedConsultationRecordFacade.java

@@ -1,93 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedConsultationNote;
-import com.diagbot.entity.MedConsultationRecord;
-import com.diagbot.service.impl.MedConsultationRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.AMedConsultationRecordVO;
-import com.diagbot.vo.data.AMedConsultationNoteVO;
-import com.diagbot.vo.data.AMedConsultationResultVO;
-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 AMedConsultationRecordFacade extends MedConsultationRecordServiceImpl {
-
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medConsultationRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedConsultationRecord medConsultationRecord=new MedConsultationRecord();
-        try {
-            AMedConsultationRecordVO aMedConsultationRecordVO=(AMedConsultationRecordVO) MapUtil.mapToObject(entityMap, AMedConsultationRecordVO.class);
-            BeanUtils.copyProperties(aMedConsultationRecordVO,medConsultationRecord);
-            medConsultationRecord.setHospitalId(hospitalId);//医院编码
-
-            medConsultationRecord.setRecordDate(DateUtil.parseDateTime(aMedConsultationRecordVO.getRecordDate()));//病历日期recordDate
-            medConsultationRecord.setBehospitalDate(DateUtil.parseDateTime(aMedConsultationRecordVO.getBehospitalDate()));//入院日期behospital_date
-            medConsultationRecord.setApplyDate(DateUtil.parseDateTime(aMedConsultationRecordVO.getApplyDate()));//申请日期apply_date
-            medConsultationRecord.setConsultationDate(DateUtil.parseDate(aMedConsultationRecordVO.getConsultationArriveDate()));//会诊时间consultation_date
-            medConsultationRecord.setRecDate(DateUtil.parseDateTime(aMedConsultationRecordVO.getRecDate()));//记录时间rec_date
-            medConsultationRecord.setAuditDate(DateUtil.parseDateTime(aMedConsultationRecordVO.getAuditDate()));//审核时间audit_date
-
-            medConsultationRecord.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medConsultationRecord)){
-                medConsultationRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(medConsultationRecord);
-            }else{
-                medConsultationRecord.setGmtModified(new Date());//记录修改时间
-                this.update(medConsultationRecord,new QueryWrapper<MedConsultationRecord>()
-                        .eq("rec_id", medConsultationRecord.getRecId())
-                        .eq("hospital_id", medConsultationRecord.getHospitalId())
-                        .eq("behospital_code", medConsultationRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊记录）",medConsultationRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedConsultationRecord medConsultationRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationRecord>()
-                .eq("rec_id", medConsultationRecord.getRecId())
-                .eq("hospital_id", medConsultationRecord.getHospitalId())
-                .eq("behospital_code", medConsultationRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedConsultationResultFacade.java

@@ -1,90 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedConsultationResult;
-import com.diagbot.service.impl.MedConsultationResultServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedConsultationResultVO;
-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 AMedConsultationResultFacade extends MedConsultationResultServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medConsultationResult");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //会诊结果单
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedConsultationResult medConsultationResult=new MedConsultationResult();
-        try {
-            AMedConsultationResultVO medConsultationResultVO=(AMedConsultationResultVO) MapUtil.mapToObject(entityMap, AMedConsultationResultVO.class);
-            BeanUtils.copyProperties(medConsultationResultVO,medConsultationResult);
-            medConsultationResult.setHospitalId(hospitalId);//医院编码
-
-            medConsultationResult.setAuditDate(DateUtil.parseDateTime(medConsultationResultVO.getAuditDate()));//审核时间
-            medConsultationResult.setRecDate(DateUtil.parseDateTime(medConsultationResultVO.getRecDate()));//记录时间
-            medConsultationResult.setBehospitalDate(DateUtil.parseDateTime(medConsultationResultVO.getBehospitalDate()));//入院日期
-            medConsultationResult.setApplyDate(DateUtil.parseDate(medConsultationResultVO.getApplyDate()));//申请时间
-            medConsultationResult.setRecordDate(DateUtil.parseDateTime(medConsultationResultVO.getRecordDate()));//病历日期
-            medConsultationResult.setConsultationArriveDate(DateUtil.parseDateTime(medConsultationResultVO.getConsultationArriveDate()));//会诊到达时间
-
-            medConsultationResult.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medConsultationResult)){
-                medConsultationResult.setGmtCreate(new Date());//记录创建时间
-                this.save(medConsultationResult);
-            }else{
-                medConsultationResult.setGmtModified(new Date());//记录修改时间
-                this.update(medConsultationResult,new QueryWrapper<MedConsultationResult>()
-                        .eq("rec_id", medConsultationResult.getRecId())
-                        .eq("hospital_id", medConsultationResult.getHospitalId())
-                        .eq("behospital_code", medConsultationResult.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",medConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedConsultationResult medConsultationResult){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedConsultationResult>()
-                .eq("rec_id", medConsultationResult.getRecId())
-                .eq("hospital_id", medConsultationResult.getHospitalId())
-                .eq("behospital_code", medConsultationResult.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedCrisisNoteFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedCrisisNote;
-import com.diagbot.service.impl.MedCrisisNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedCrisisNoteVO;
-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 AMedCrisisNoteFacade extends MedCrisisNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medCrisisNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedCrisisNote medCrisisNote=new MedCrisisNote();
-        try {
-            AMedCrisisNoteVO medCrisisNoteVO=(AMedCrisisNoteVO) MapUtil.mapToObject(entityMap, AMedCrisisNoteVO.class);
-            BeanUtils.copyProperties(medCrisisNoteVO,medCrisisNote);
-            medCrisisNote.setHospitalId(hospitalId);//医院编码
-
-            medCrisisNote.setAuditDate(DateUtil.parseDateTime(medCrisisNoteVO.getAuditDate()));//审核时间
-            medCrisisNote.setRecDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecDate()));//记录时间
-            medCrisisNote.setRecieveDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecieveDate()));//开始时间
-            medCrisisNote.setAuditDate(DateUtil.parseDate(medCrisisNoteVO.getAuditDate()));//结束时间
-            medCrisisNote.setRecordDate(DateUtil.parseDateTime(medCrisisNoteVO.getRecordDate()));//病历日期
-
-            medCrisisNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medCrisisNote)){
-                medCrisisNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medCrisisNote);
-            }else{
-                medCrisisNote.setGmtModified(new Date());//记录修改时间
-                this.update(medCrisisNote,new QueryWrapper<MedCrisisNote>()
-                        .eq("rec_id", medCrisisNote.getRecId())
-                        .eq("hospital_id", medCrisisNote.getHospitalId())
-                        .eq("behospital_code", medCrisisNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",medCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedCrisisNote medCrisisNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedCrisisNote>()
-                .eq("rec_id", medCrisisNote.getRecId())
-                .eq("hospital_id", medCrisisNote.getHospitalId())
-                .eq("behospital_code", medCrisisNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedDeathDiscussionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedDeathDiscussion;
-import com.diagbot.service.impl.MedDeathDiscussionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedDeathDiscussionVO;
-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 AMedDeathDiscussionFacade extends MedDeathDiscussionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medDeathDiscussion");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //死亡病例讨论记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedDeathDiscussion medDeathDiscussion=new MedDeathDiscussion();
-        try {
-            AMedDeathDiscussionVO medDeathDiscussionVO=(AMedDeathDiscussionVO) MapUtil.mapToObject(entityMap, AMedDeathDiscussionVO.class);
-            BeanUtils.copyProperties(medDeathDiscussionVO,medDeathDiscussion);
-            medDeathDiscussion.setHospitalId(hospitalId);//医院编码
-
-            medDeathDiscussion.setAuditDate(DateUtil.parseDateTime(medDeathDiscussionVO.getAuditDate()));//审核时间
-            medDeathDiscussion.setRecDate(DateUtil.parseDateTime(medDeathDiscussionVO.getRecDate()));//记录时间
-            medDeathDiscussion.setDeathDate(DateUtil.parseDateTime(medDeathDiscussionVO.getDeathDate()));//死亡时间
-            medDeathDiscussion.setDiscussDate(DateUtil.parseDate(medDeathDiscussionVO.getDiscussDate()));//讨论时间
-            medDeathDiscussion.setRecordDate(DateUtil.parseDateTime(medDeathDiscussionVO.getRecordDate()));//病历日期
-
-            medDeathDiscussion.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medDeathDiscussion)){
-                medDeathDiscussion.setGmtCreate(new Date());//记录创建时间
-                this.save(medDeathDiscussion);
-            }else{
-                medDeathDiscussion.setGmtModified(new Date());//记录修改时间
-                this.update(medDeathDiscussion,new QueryWrapper<MedDeathDiscussion>()
-                        .eq("rec_id", medDeathDiscussion.getRecId())
-                        .eq("hospital_id", medDeathDiscussion.getHospitalId())
-                        .eq("behospital_code", medDeathDiscussion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",medDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedDeathDiscussion medDeathDiscussion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedDeathDiscussion>()
-                .eq("rec_id", medDeathDiscussion.getRecId())
-                .eq("hospital_id", medDeathDiscussion.getHospitalId())
-                .eq("behospital_code", medDeathDiscussion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedDeathNoteFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedDeathNote;
-import com.diagbot.service.impl.MedDeathNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedDeathNoteVO;
-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 AMedDeathNoteFacade extends MedDeathNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medDeathNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //死亡记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedDeathNote medDeathNote=new MedDeathNote();
-        try {
-            AMedDeathNoteVO medDeathNoteVO=(AMedDeathNoteVO) MapUtil.mapToObject(entityMap, AMedDeathNoteVO.class);
-            BeanUtils.copyProperties(medDeathNoteVO,medDeathNote);
-            medDeathNote.setHospitalId(hospitalId);//医院编码
-
-            medDeathNote.setAuditDate(DateUtil.parseDateTime(medDeathNoteVO.getAuditDate()));//审核时间
-            medDeathNote.setRecDate(DateUtil.parseDateTime(medDeathNoteVO.getRecDate()));//记录时间
-            medDeathNote.setBehospitalDate(DateUtil.parseDateTime(medDeathNoteVO.getBehospitalDate()));//入院日期
-            medDeathNote.setDeathDate(DateUtil.parseDate(medDeathNoteVO.getDeathDate()));//死亡日期
-            medDeathNote.setRecordDate(DateUtil.parseDateTime(medDeathNoteVO.getRecordDate()));//病历日期
-
-            medDeathNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medDeathNote)){
-                medDeathNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medDeathNote);
-            }else{
-                medDeathNote.setGmtModified(new Date());//记录修改时间
-                this.update(medDeathNote,new QueryWrapper<MedDeathNote>()
-                        .eq("rec_id", medDeathNote.getRecId())
-                        .eq("hospital_id", medDeathNote.getHospitalId())
-                        .eq("behospital_code", medDeathNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", medDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedDeathNote medDeathNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedDeathNote>()
-                .eq("rec_id", medDeathNote.getRecId())
-                .eq("hospital_id", medDeathNote.getHospitalId())
-                .eq("behospital_code", medDeathNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedIllCriticallyFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-
-@Component
-public class AMedIllCriticallyFacade extends MedIllCriticallyServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medIllCritically");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedIllCritically medIllCritically=new MedIllCritically();
-        try {
-            AMedIllCriticallyVO medIllCriticallyVO=(AMedIllCriticallyVO) MapUtil.mapToObject(entityMap, AMedIllCriticallyVO.class);
-            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()));//病历日期
-
-            medIllCritically.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单",medIllCritically.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedIllSeriouslFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedIllSeriousl medIllSeriousl=new MedIllSeriousl();
-        try {
-            AMedIllSeriouslVO medIllSeriouslVO=(AMedIllSeriouslVO) MapUtil.mapToObject(entityMap, AMedIllSeriouslVO.class);
-            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()));//病历日期
-
-            medIllSeriousl.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", medIllSeriousl.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedLeaveHospitalFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedLeaveHospital;
-import com.diagbot.service.impl.MedLeaveHospitalServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedLeaveHospitalVO;
-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 AMedLeaveHospitalFacade extends MedLeaveHospitalServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medLeaveHospital");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //危急值记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedLeaveHospital medLeaveHospital=new MedLeaveHospital();
-        try {
-            AMedLeaveHospitalVO medLeaveHospitalVO=(AMedLeaveHospitalVO) MapUtil.mapToObject(entityMap, AMedLeaveHospitalVO.class);
-            BeanUtils.copyProperties(medLeaveHospitalVO,medLeaveHospital);
-            medLeaveHospital.setHospitalId(hospitalId);//医院编码
-
-            medLeaveHospital.setAuditDate(DateUtil.parseDateTime(medLeaveHospitalVO.getAuditDate()));//审核时间
-            medLeaveHospital.setRecDate(DateUtil.parseDateTime(medLeaveHospitalVO.getRecDate()));//记录时间
-            medLeaveHospital.setBehospitalDate(DateUtil.parseDateTime(medLeaveHospitalVO.getBehospitalDate()));//入院日期
-            medLeaveHospital.setLeaveHospitalDate(DateUtil.parseDateTime(medLeaveHospitalVO.getLeaveHospitalDate()));//出院时间
-            medLeaveHospital.setRecordDate(DateUtil.parseDateTime(medLeaveHospitalVO.getRecordDate()));//病历日期
-
-            medLeaveHospital.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medLeaveHospital)){
-                medLeaveHospital.setGmtCreate(new Date());//记录创建时间
-                this.save(medLeaveHospital);
-            }else{
-                medLeaveHospital.setGmtModified(new Date());//记录修改时间
-                this.update(medLeaveHospital,new QueryWrapper<MedLeaveHospital>()
-                        .eq("rec_id", medLeaveHospital.getRecId())
-                        .eq("hospital_id", medLeaveHospital.getHospitalId())
-                        .eq("behospital_code", medLeaveHospital.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结",medLeaveHospital.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedLeaveHospital medLeaveHospital){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedLeaveHospital>()
-                .eq("rec_id", medLeaveHospital.getRecId())
-                .eq("hospital_id", medLeaveHospital.getHospitalId())
-                .eq("behospital_code", medLeaveHospital.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedOperativeFirstRecord.java

@@ -1,90 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedOperativeFirstRecord;
-import com.diagbot.service.impl.MedOperativeFirstRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedOperativeFirstRecordVO;
-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 AMedOperativeFirstRecord extends MedOperativeFirstRecordServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medOperativeFirstRecord");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //术后首程
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedOperativeFirstRecord medOperativeFirstRecord=new MedOperativeFirstRecord();
-        try {
-            AMedOperativeFirstRecordVO medOperativeFirstRecordVO=(AMedOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AMedOperativeFirstRecordVO.class);
-            BeanUtils.copyProperties(medOperativeFirstRecordVO,medOperativeFirstRecord);
-            medOperativeFirstRecord.setHospitalId(hospitalId);//医院编码
-
-            medOperativeFirstRecord.setAuditDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getAuditDate()));//审核时间
-            medOperativeFirstRecord.setRecDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getRecDate()));//记录时间
-            medOperativeFirstRecord.setOperationDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getOperationDate()));//手术日期
-            medOperativeFirstRecord.setStartTime(DateUtil.parseDate(medOperativeFirstRecordVO.getStartTime()));//开始时间
-            medOperativeFirstRecord.setEndTime(DateUtil.parseDate(medOperativeFirstRecordVO.getEndTime()));//结束时间
-            medOperativeFirstRecord.setRecordDate(DateUtil.parseDateTime(medOperativeFirstRecordVO.getRecordDate()));//病历日期
-
-            medOperativeFirstRecord.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medOperativeFirstRecord)){
-                medOperativeFirstRecord.setGmtCreate(new Date());//记录创建时间
-                this.save(medOperativeFirstRecord);
-            }else{
-                medOperativeFirstRecord.setGmtModified(new Date());//记录修改时间
-                this.update(medOperativeFirstRecord,new QueryWrapper<MedOperativeFirstRecord>()
-                        .eq("rec_id", medOperativeFirstRecord.getRecId())
-                        .eq("hospital_id", medOperativeFirstRecord.getHospitalId())
-                        .eq("behospital_code", medOperativeFirstRecord.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程",medOperativeFirstRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedOperativeFirstRecord medOperativeFirstRecord){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedOperativeFirstRecord>()
-                .eq("rec_id", medOperativeFirstRecord.getRecId())
-                .eq("hospital_id", medOperativeFirstRecord.getHospitalId())
-                .eq("behospital_code", medOperativeFirstRecord.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedOperativeNoteFacade.java

@@ -1,89 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedOperativeNote;
-import com.diagbot.service.impl.MedOperativeNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedOperativeNoteVO;
-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 AMedOperativeNoteFacade extends MedOperativeNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medOperativeNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //手术记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedOperativeNote medOperativeNote=new MedOperativeNote();
-        try {
-            AMedOperativeNoteVO medOperativeNoteVO=(AMedOperativeNoteVO) MapUtil.mapToObject(entityMap, AMedOperativeNoteVO.class);
-            BeanUtils.copyProperties(medOperativeNoteVO,medOperativeNote);
-            medOperativeNote.setHospitalId(hospitalId);//医院编码
-
-            medOperativeNote.setAuditDate(DateUtil.parseDateTime(medOperativeNoteVO.getAuditDate()));//审核时间
-            medOperativeNote.setRecDate(DateUtil.parseDateTime(medOperativeNoteVO.getRecDate()));//记录时间
-            medOperativeNote.setOperationDate(DateUtil.parseDateTime(medOperativeNoteVO.getOperationDate()));//手术日期
-            medOperativeNote.setStartTime(DateUtil.parseDate(medOperativeNoteVO.getStartTime()));//开始时间
-            medOperativeNote.setEndTime(DateUtil.parseDate(medOperativeNoteVO.getEndTime()));//结束时间
-            medOperativeNote.setRecordDate(DateUtil.parseDateTime(medOperativeNoteVO.getRecordDate()));//病历日期
-
-            medOperativeNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medOperativeNote)){
-                medOperativeNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medOperativeNote);
-            }else{
-                medOperativeNote.setGmtModified(new Date());//记录修改时间
-                this.update(medOperativeNote,new QueryWrapper<MedOperativeNote>()
-                        .eq("rec_id", medOperativeNote.getRecId())
-                        .eq("hospital_id", medOperativeNote.getHospitalId())
-                        .eq("behospital_code", medOperativeNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", medOperativeNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedOperativeNote medOperativeNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedOperativeNote>()
-                .eq("rec_id", medOperativeNote.getRecId())
-                .eq("hospital_id", medOperativeNote.getHospitalId())
-                .eq("behospital_code", medOperativeNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedPeriodConclusionFacade.java

@@ -1,88 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-
-@Component
-public class AMedPeriodConclusionFacade extends MedPeriodConclusionServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medPeriodConclusion");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedPeriodConclusion medPeriodConclusion=new MedPeriodConclusion();
-        try {
-            AMedPeriodConclusionVO medPeriodConclusionVO=(AMedPeriodConclusionVO) MapUtil.mapToObject(entityMap, AMedPeriodConclusionVO.class);
-            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()));//病历日期
-
-            medPeriodConclusion.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结",medPeriodConclusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-
-}

src/main/java/com/diagbot/facade/data/AMedPreoperativeDiscussionFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedPreoperativeDiscussion;
-import com.diagbot.service.impl.MedPreoperativeDiscussionServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedPreoperativeDiscussionVO;
-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 AMedPreoperativeDiscussionFacade extends MedPreoperativeDiscussionServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medPreoperativeDiscussion");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    //入院记录
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedPreoperativeDiscussion medPreoperativeDiscussion=new MedPreoperativeDiscussion();
-        try {
-            AMedPreoperativeDiscussionVO medPreoperativeDiscussionVO=(AMedPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AMedPreoperativeDiscussionVO.class);
-            BeanUtils.copyProperties(medPreoperativeDiscussionVO,medPreoperativeDiscussion);
-            medPreoperativeDiscussion.setHospitalId(hospitalId);//医院编码
-
-            medPreoperativeDiscussion.setAuditDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getAuditDate()));//审核时间
-            medPreoperativeDiscussion.setRecDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getRecDate()));//记录时间
-            medPreoperativeDiscussion.setDiscussTime(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getDiscussTime()));//讨论时间
-            medPreoperativeDiscussion.setRecordDate(DateUtil.parseDateTime(medPreoperativeDiscussionVO.getRecordDate()));//病历日期
-
-            medPreoperativeDiscussion.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medPreoperativeDiscussion)){
-                medPreoperativeDiscussion.setGmtCreate(new Date());//记录创建时间
-                this.save(medPreoperativeDiscussion);
-            }else{
-                medPreoperativeDiscussion.setGmtModified(new Date());//记录修改时间
-                this.update(medPreoperativeDiscussion,new QueryWrapper<MedPreoperativeDiscussion>()
-                        .eq("rec_id", medPreoperativeDiscussion.getRecId())
-                        .eq("hospital_id", medPreoperativeDiscussion.getHospitalId())
-                        .eq("behospital_code", medPreoperativeDiscussion.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结",medPreoperativeDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedPreoperativeDiscussion medPreoperativeDiscussion){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedPreoperativeDiscussion>()
-                .eq("rec_id", medPreoperativeDiscussion.getRecId())
-                .eq("hospital_id", medPreoperativeDiscussion.getHospitalId())
-                .eq("behospital_code", medPreoperativeDiscussion.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedRescueNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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.MedRescueNote;
-import com.diagbot.service.impl.MedRescueNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedRescueNoteVO;
-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 AMedRescueNoteFacade extends MedRescueNoteServiceImpl {
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medRescueNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedRescueNote medRescueNote=new MedRescueNote();
-        try {
-            AMedRescueNoteVO medRescueNoteVO=(AMedRescueNoteVO) MapUtil.mapToObject(entityMap, AMedRescueNoteVO.class);
-            BeanUtils.copyProperties(medRescueNoteVO,medRescueNote);
-            medRescueNote.setHospitalId(hospitalId);//医院编码
-
-            medRescueNote.setAuditDate(DateUtil.parseDateTime(medRescueNoteVO.getAuditDate()));//审核时间
-            medRescueNote.setRecDate(DateUtil.parseDateTime(medRescueNoteVO.getRecDate()));//记录时间
-            medRescueNote.setStartTime(DateUtil.parseDateTime(medRescueNoteVO.getStartTime()));//开始时间
-            medRescueNote.setEndTime(DateUtil.parseDate(medRescueNoteVO.getEndTime()));//结束时间
-            medRescueNote.setRecordDate(DateUtil.parseDateTime(medRescueNoteVO.getRecordDate()));//病历日期
-
-            medRescueNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在insert
-            if(isExist(medRescueNote)){
-                medRescueNote.setGmtCreate(new Date());//记录创建时间
-                this.save(medRescueNote);
-            }else{
-                medRescueNote.setGmtModified(new Date());//记录修改时间
-                this.update(medRescueNote,new QueryWrapper<MedRescueNote>()
-                        .eq("rec_id", medRescueNote.getRecId())
-                        .eq("hospital_id", medRescueNote.getHospitalId())
-                        .eq("behospital_code", medRescueNote.getBehospitalCode()));
-            }
-
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", medRescueNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    public Boolean isExist(MedRescueNote medRescueNote){
-        Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedRescueNote>()
-                .eq("rec_id", medRescueNote.getRecId())
-                .eq("hospital_id", medRescueNote.getHospitalId())
-                .eq("behospital_code", medRescueNote.getBehospitalCode()));
-        if(count>0){
-            flag=false;
-        }
-        return flag;
-    }
-}

src/main/java/com/diagbot/facade/data/AMedTransferInNoteFacade.java

@@ -1,87 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-
-@Component
-public class AMedTransferInNoteFacade extends MedTransferInNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medTransferInNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedTransferInNote medTransferInNote=new MedTransferInNote();
-        try {
-            AMedTransferInNoteVO medTransferInNoteVO=(AMedTransferInNoteVO) MapUtil.mapToObject(entityMap, AMedTransferInNoteVO.class);
-            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()));//病历日期
-
-            medTransferInNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录",medTransferInNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-
-}

src/main/java/com/diagbot/facade/data/AMedTransferOutNoteFacade.java

@@ -1,85 +0,0 @@
-package com.diagbot.facade.data;
-
-import com.alibaba.fastjson.JSON;
-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;
-
-@Component
-public class AMedTransferOutNoteFacade extends MedTransferOutNoteServiceImpl {
-
-    @Autowired
-    private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    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,"medTransferOutNote");
-
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
-        if(!flag){
-            return;
-        }
-    }
-
-    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedTransferOutNote medTransferOutNote=new MedTransferOutNote();
-        try {
-            AMedTransferOutNoteVO medTransferOutNoteVO=(AMedTransferOutNoteVO) MapUtil.mapToObject(entityMap, AMedTransferOutNoteVO.class);
-            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()));//病历日期
-
-            medTransferOutNote.setWholeData(columnMap);
-            //判断数据库中是否存在，不存在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);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录",medTransferOutNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
-        }
-
-    }
-
-    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;
-    }
-}

src/main/java/com/diagbot/facade/data/AStrAdmissionNoteFacade.java

@@ -0,0 +1,87 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrAdmissionNote;
+import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrAdmissionNoteVO;
+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 AStrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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, "strAdmissionNote");
+
+        //Map<String, String> map=columnFacade.getColumn("strAdmissionNote");
+        if (!flag) {
+            return;
+        }
+    }
+
+    //入院记录
+    public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) {
+        StrAdmissionNote strAdmissionNote = new StrAdmissionNote();
+        try {
+            AStrAdmissionNoteVO strAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(entityMap, AStrAdmissionNoteVO.class);
+            BeanUtils.copyProperties(strAdmissionNoteVO, strAdmissionNote);
+            strAdmissionNote.setHospitalId(hospitalId);//医院编码
+
+            strAdmissionNote.setAuditDate(DateUtil.parseDateTime(strAdmissionNoteVO.getAuditDate()));//审核时间
+            strAdmissionNote.setRecDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecDate()));//记录时间
+            strAdmissionNote.setBehospitalDate(DateUtil.parseDateTime(strAdmissionNoteVO.getBehospitalDate()));//入院日期
+            strAdmissionNote.setBirthday(DateUtil.parseDate(strAdmissionNoteVO.getBirthday()));//出生日期
+            strAdmissionNote.setRecordDate(DateUtil.parseDateTime(strAdmissionNoteVO.getRecordDate()));//病历日期
+
+            strAdmissionNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if (isExist(strAdmissionNote)) {
+                strAdmissionNote.setGmtCreate(new Date());//记录创建时间
+                this.save(strAdmissionNote);
+            } else {
+                strAdmissionNote.setGmtModified(new Date());//记录修改时间
+                this.update(strAdmissionNote, new QueryWrapper<StrAdmissionNote>()
+                        .eq("rec_id", strAdmissionNote.getRecId())
+                        .eq("hospital_id", strAdmissionNote.getHospitalId())
+                        .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("入院记录", strAdmissionNote.getRecId(), JSON.toJSONString(entityMap), "", e.getMessage());
+        }
+    }
+
+    public Boolean isExist(StrAdmissionNote strAdmissionNote) {
+        Boolean flag = true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrAdmissionNote>()
+                .eq("rec_id", strAdmissionNote.getRecId())
+                .eq("hospital_id", strAdmissionNote.getHospitalId())
+                .eq("behospital_code", strAdmissionNote.getBehospitalCode()));
+        if (count > 0) {
+            flag = false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AMedBloodResultFacade.java

@@ -4,12 +4,12 @@ import com.alibaba.fastjson.JSON;
 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.entity.StrBloodResult;
+import com.diagbot.service.impl.StrBloodResultServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedBloodResultVO;
+import com.diagbot.vo.data.AStrBloodResultVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
+public class AStrBloodResultFacade extends StrBloodResultServiceImpl {
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -39,41 +39,41 @@ public class AMedBloodResultFacade extends MedBloodResultServiceImpl {
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedBloodResult medBloodResult=new MedBloodResult();
+        StrBloodResult strBloodResult=new StrBloodResult();
         try {
-            AMedBloodResultVO medBloodResultVO=(AMedBloodResultVO) MapUtil.mapToObject(entityMap, AMedBloodResultVO.class);
-            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()));//病历日期
+            AStrBloodResultVO strBloodResultVO=(AStrBloodResultVO) MapUtil.mapToObject(entityMap, AStrBloodResultVO.class);
+            BeanUtils.copyProperties(strBloodResultVO,strBloodResult);
+            strBloodResult.setHospitalId(hospitalId);//医院编码
+            strBloodResult.setAuditDate(DateUtil.parseDateTime(strBloodResultVO.getAuditDate()));//审核时间
+            strBloodResult.setRecDate(DateUtil.parseDateTime(strBloodResultVO.getRecDate()));//记录时间
+            strBloodResult.setRecordDate(DateUtil.parseDateTime(strBloodResultVO.getRecordDate()));//病历日期
 
-            medBloodResult.setWholeData(columnMap);
+            strBloodResult.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
-            if(isExist(medBloodResult)){
-                medBloodResult.setGmtCreate(new Date());//记录创建时间
-                this.save(medBloodResult);
+            if(isExist(strBloodResult)){
+                strBloodResult.setGmtCreate(new Date());//记录创建时间
+                this.save(strBloodResult);
             }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()));
+                strBloodResult.setGmtModified(new Date());//记录修改时间
+                this.update(strBloodResult,new QueryWrapper<StrBloodResult>()
+                        .eq("rec_id", strBloodResult.getRecId())
+                        .eq("hospital_id", strBloodResult.getHospitalId())
+                        .eq("behospital_code", strBloodResult.getBehospitalCode()));
             }
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",medBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",strBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
 
-    public Boolean isExist(MedBloodResult medBloodResult){
+    public Boolean isExist(StrBloodResult strBloodResult){
         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()));
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrBloodResult>()
+                .eq("rec_id", strBloodResult.getRecId())
+                .eq("hospital_id", strBloodResult.getHospitalId())
+                .eq("behospital_code", strBloodResult.getBehospitalCode()));
         if(count>0){
             flag=false;
         }

src/main/java/com/diagbot/facade/data/AStrBloodTransfusionFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrBloodTransfusion;
+import com.diagbot.service.impl.StrBloodTransfusionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrBloodTransfusionVO;
+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 AStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strBloodTransfusion");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrBloodTransfusion strBloodTransfusion=new StrBloodTransfusion();
+        try {
+            AStrBloodTransfusionVO strBloodTransfusionVO=(AStrBloodTransfusionVO) MapUtil.mapToObject(entityMap, AStrBloodTransfusionVO.class);
+            BeanUtils.copyProperties(strBloodTransfusionVO,strBloodTransfusion);
+            strBloodTransfusion.setHospitalId(hospitalId);//医院编码
+            strBloodTransfusion.setStartTime(DateUtil.parseDateTime(strBloodTransfusionVO.getStartTime()));
+            strBloodTransfusion.setEndTime(DateUtil.parseDateTime(strBloodTransfusionVO.getEndTime()));
+            strBloodTransfusion.setAuditDate(DateUtil.parseDateTime(strBloodTransfusionVO.getAuditDate()));//审核时间
+            strBloodTransfusion.setRecDate(DateUtil.parseDateTime(strBloodTransfusionVO.getRecDate()));//记录时间
+            strBloodTransfusion.setRecordDate(DateUtil.parseDateTime(strBloodTransfusionVO.getRecordDate()));//病历日期
+
+            strBloodTransfusion.setWholeData(columnMap);
+
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strBloodTransfusion)){
+                strBloodTransfusion.setGmtCreate(new Date());//记录创建时间
+                this.save(strBloodTransfusion);
+            }else{
+                strBloodTransfusion.setGmtModified(new Date());//记录修改时间
+                this.update(strBloodTransfusion,new QueryWrapper<StrBloodTransfusion>()
+                        .eq("rec_id", strBloodTransfusion.getRecId())
+                        .eq("hospital_id", strBloodTransfusion.getHospitalId())
+                        .eq("behospital_code", strBloodTransfusion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", strBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrBloodTransfusion strBloodTransfusion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrBloodTransfusion>()
+                .eq("rec_id", strBloodTransfusion.getRecId())
+                .eq("hospital_id", strBloodTransfusion.getHospitalId())
+                .eq("behospital_code", strBloodTransfusion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AStrConsultationApplyFacade.java

@@ -0,0 +1,89 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrConsultationApply;
+import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrConsultationApplyVO;
+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 AStrConsultationApplyFacade extends StrConsultationApplyServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strConsultationApply");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊申请单
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrConsultationApply strConsultationApply=new StrConsultationApply();
+        try {
+            AStrConsultationApplyVO strConsultationApplyVO=(AStrConsultationApplyVO) MapUtil.mapToObject(entityMap, AStrConsultationApplyVO.class);
+            BeanUtils.copyProperties(strConsultationApplyVO,strConsultationApply);
+            strConsultationApply.setHospitalId(hospitalId);//医院编码
+
+            strConsultationApply.setAuditDate(DateUtil.parseDateTime(strConsultationApplyVO.getAuditDate()));//审核时间
+            strConsultationApply.setRecDate(DateUtil.parseDateTime(strConsultationApplyVO.getRecDate()));//记录时间
+            strConsultationApply.setBehospitalDate(DateUtil.parseDateTime(strConsultationApplyVO.getBehospitalDate()));//入院日期
+            strConsultationApply.setRecordDate(DateUtil.parseDateTime(strConsultationApplyVO.getRecordDate()));//病历日期
+            strConsultationApply.setApplyDate(DateUtil.parseDateTime(strConsultationApplyVO.getApplyDate()));//申请日期
+            strConsultationApply.setConsultationDate(DateUtil.parseDateTime(strConsultationApplyVO.getConsultationDate()));//会诊时间
+            strConsultationApply.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strConsultationApply)){
+                strConsultationApply.setGmtCreate(new Date());//记录创建时间
+                this.save(strConsultationApply);
+            }else{
+                strConsultationApply.setGmtModified(new Date());//记录修改时间
+                this.update(strConsultationApply,new QueryWrapper<StrConsultationApply>()
+                        .eq("rec_id", strConsultationApply.getRecId())
+                        .eq("hospital_id", strConsultationApply.getHospitalId())
+                        .eq("behospital_code", strConsultationApply.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",strConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrConsultationApply strConsultationApply){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationApply>()
+                .eq("rec_id", strConsultationApply.getRecId())
+                .eq("hospital_id", strConsultationApply.getHospitalId())
+                .eq("behospital_code", strConsultationApply.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AStrConsultationNoteFacade.java

@@ -0,0 +1,91 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrConsultationNote;
+import com.diagbot.service.impl.StrConsultationNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrConsultationNoteVO;
+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 AStrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strConsultationNote");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊单（申请和结果）
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrConsultationNote strConsultationNote=new StrConsultationNote();
+        try {
+            AStrConsultationNoteVO strConsultationNoteVO=(AStrConsultationNoteVO) MapUtil.mapToObject(entityMap, AStrConsultationNoteVO.class);
+            BeanUtils.copyProperties(strConsultationNoteVO,strConsultationNote);
+            strConsultationNote.setHospitalId(hospitalId);//医院编码
+
+            strConsultationNote.setAuditDate(DateUtil.parseDateTime(strConsultationNoteVO.getAuditDate()));//审核时间
+            strConsultationNote.setRecDate(DateUtil.parseDateTime(strConsultationNoteVO.getRecDate()));//记录时间
+            strConsultationNote.setBehospitalDate(DateUtil.parseDateTime(strConsultationNoteVO.getBehospitalDate()));//入院日期
+            strConsultationNote.setApplyDate(DateUtil.parseDate(strConsultationNoteVO.getApplyDate()));//申请日期
+            strConsultationNote.setRecordDate(DateUtil.parseDateTime(strConsultationNoteVO.getRecordDate()));//病历日期
+            strConsultationNote.setConsultationDate(DateUtil.parseDateTime(strConsultationNoteVO.getConsultationDate()));//会诊时间
+
+            strConsultationNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strConsultationNote)){
+                strConsultationNote.setGmtCreate(new Date());//记录创建时间
+                this.save(strConsultationNote);
+            }else{
+                strConsultationNote.setGmtModified(new Date());//记录修改时间
+                this.update(strConsultationNote,new QueryWrapper<StrConsultationNote>()
+                        .eq("rec_id", strConsultationNote.getRecId())
+                        .eq("hospital_id", strConsultationNote.getHospitalId())
+                        .eq("behospital_code", strConsultationNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",strConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrConsultationNote strConsultationNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationNote>()
+                .eq("rec_id", strConsultationNote.getRecId())
+                .eq("hospital_id", strConsultationNote.getHospitalId())
+                .eq("behospital_code", strConsultationNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+
+}

src/main/java/com/diagbot/facade/data/AStrConsultationRecordFacade.java

@@ -0,0 +1,92 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrConsultationRecord;
+import com.diagbot.service.impl.StrConsultationRecordServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.AStrConsultationRecordVO;
+import com.diagbot.vo.data.AStrConsultationNoteVO;
+import com.diagbot.vo.data.AStrConsultationResultVO;
+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 AStrConsultationRecordFacade extends StrConsultationRecordServiceImpl {
+
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strConsultationRecord");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrConsultationRecord strConsultationRecord=new StrConsultationRecord();
+        try {
+            AStrConsultationRecordVO AStrConsultationRecordVO=(AStrConsultationRecordVO) MapUtil.mapToObject(entityMap, AStrConsultationRecordVO.class);
+            BeanUtils.copyProperties(AStrConsultationRecordVO,strConsultationRecord);
+            strConsultationRecord.setHospitalId(hospitalId);//医院编码
+
+            strConsultationRecord.setRecordDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecordDate()));//病历日期recordDate
+            strConsultationRecord.setBehospitalDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getBehospitalDate()));//入院日期behospital_date
+            strConsultationRecord.setApplyDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getApplyDate()));//申请日期apply_date
+            strConsultationRecord.setConsultationDate(DateUtil.parseDate(AStrConsultationRecordVO.getConsultationArriveDate()));//会诊时间consultation_date
+            strConsultationRecord.setRecDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecDate()));//记录时间rec_date
+            strConsultationRecord.setAuditDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getAuditDate()));//审核时间audit_date
+
+            strConsultationRecord.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strConsultationRecord)){
+                strConsultationRecord.setGmtCreate(new Date());//记录创建时间
+                this.save(strConsultationRecord);
+            }else{
+                strConsultationRecord.setGmtModified(new Date());//记录修改时间
+                this.update(strConsultationRecord,new QueryWrapper<StrConsultationRecord>()
+                        .eq("rec_id", strConsultationRecord.getRecId())
+                        .eq("hospital_id", strConsultationRecord.getHospitalId())
+                        .eq("behospital_code", strConsultationRecord.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊记录）",strConsultationRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrConsultationRecord strConsultationRecord){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationRecord>()
+                .eq("rec_id", strConsultationRecord.getRecId())
+                .eq("hospital_id", strConsultationRecord.getHospitalId())
+                .eq("behospital_code", strConsultationRecord.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AStrConsultationResultFacade.java

@@ -0,0 +1,90 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrConsultationResult;
+import com.diagbot.service.impl.StrConsultationResultServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrConsultationResultVO;
+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 AStrConsultationResultFacade extends StrConsultationResultServiceImpl {
+
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strConsultationResult");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //会诊结果单
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrConsultationResult strConsultationResult=new StrConsultationResult();
+        try {
+            AStrConsultationResultVO strConsultationResultVO=(AStrConsultationResultVO) MapUtil.mapToObject(entityMap, AStrConsultationResultVO.class);
+            BeanUtils.copyProperties(strConsultationResultVO,strConsultationResult);
+            strConsultationResult.setHospitalId(hospitalId);//医院编码
+
+            strConsultationResult.setAuditDate(DateUtil.parseDateTime(strConsultationResultVO.getAuditDate()));//审核时间
+            strConsultationResult.setRecDate(DateUtil.parseDateTime(strConsultationResultVO.getRecDate()));//记录时间
+            strConsultationResult.setBehospitalDate(DateUtil.parseDateTime(strConsultationResultVO.getBehospitalDate()));//入院日期
+            strConsultationResult.setApplyDate(DateUtil.parseDate(strConsultationResultVO.getApplyDate()));//申请时间
+            strConsultationResult.setRecordDate(DateUtil.parseDateTime(strConsultationResultVO.getRecordDate()));//病历日期
+            strConsultationResult.setConsultationArriveDate(DateUtil.parseDateTime(strConsultationResultVO.getConsultationArriveDate()));//会诊到达时间
+
+            strConsultationResult.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strConsultationResult)){
+                strConsultationResult.setGmtCreate(new Date());//记录创建时间
+                this.save(strConsultationResult);
+            }else{
+                strConsultationResult.setGmtModified(new Date());//记录修改时间
+                this.update(strConsultationResult,new QueryWrapper<StrConsultationResult>()
+                        .eq("rec_id", strConsultationResult.getRecId())
+                        .eq("hospital_id", strConsultationResult.getHospitalId())
+                        .eq("behospital_code", strConsultationResult.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",strConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrConsultationResult strConsultationResult){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrConsultationResult>()
+                .eq("rec_id", strConsultationResult.getRecId())
+                .eq("hospital_id", strConsultationResult.getHospitalId())
+                .eq("behospital_code", strConsultationResult.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AStrCrisisNoteFacade.java

@@ -0,0 +1,85 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrCrisisNote;
+import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrCrisisNoteVO;
+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 AStrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strCrisisNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrCrisisNote strCrisisNote=new StrCrisisNote();
+        try {
+            AStrCrisisNoteVO strCrisisNoteVO=(AStrCrisisNoteVO) MapUtil.mapToObject(entityMap, AStrCrisisNoteVO.class);
+            BeanUtils.copyProperties(strCrisisNoteVO,strCrisisNote);
+            strCrisisNote.setHospitalId(hospitalId);//医院编码
+
+            strCrisisNote.setAuditDate(DateUtil.parseDateTime(strCrisisNoteVO.getAuditDate()));//审核时间
+            strCrisisNote.setRecDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecDate()));//记录时间
+            strCrisisNote.setRecieveDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecieveDate()));//开始时间
+            strCrisisNote.setAuditDate(DateUtil.parseDate(strCrisisNoteVO.getAuditDate()));//结束时间
+            strCrisisNote.setRecordDate(DateUtil.parseDateTime(strCrisisNoteVO.getRecordDate()));//病历日期
+
+            strCrisisNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strCrisisNote)){
+                strCrisisNote.setGmtCreate(new Date());//记录创建时间
+                this.save(strCrisisNote);
+            }else{
+                strCrisisNote.setGmtModified(new Date());//记录修改时间
+                this.update(strCrisisNote,new QueryWrapper<StrCrisisNote>()
+                        .eq("rec_id", strCrisisNote.getRecId())
+                        .eq("hospital_id", strCrisisNote.getHospitalId())
+                        .eq("behospital_code", strCrisisNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",strCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrCrisisNote strCrisisNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrCrisisNote>()
+                .eq("rec_id", strCrisisNote.getRecId())
+                .eq("hospital_id", strCrisisNote.getHospitalId())
+                .eq("behospital_code", strCrisisNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AStrDeathDiscussionFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrDeathDiscussion;
+import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrDeathDiscussionVO;
+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 AStrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strDeathDiscussion");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //死亡病例讨论记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrDeathDiscussion strDeathDiscussion=new StrDeathDiscussion();
+        try {
+            AStrDeathDiscussionVO strDeathDiscussionVO=(AStrDeathDiscussionVO) MapUtil.mapToObject(entityMap, AStrDeathDiscussionVO.class);
+            BeanUtils.copyProperties(strDeathDiscussionVO,strDeathDiscussion);
+            strDeathDiscussion.setHospitalId(hospitalId);//医院编码
+
+            strDeathDiscussion.setAuditDate(DateUtil.parseDateTime(strDeathDiscussionVO.getAuditDate()));//审核时间
+            strDeathDiscussion.setRecDate(DateUtil.parseDateTime(strDeathDiscussionVO.getRecDate()));//记录时间
+            strDeathDiscussion.setDeathDate(DateUtil.parseDateTime(strDeathDiscussionVO.getDeathDate()));//死亡时间
+            strDeathDiscussion.setDiscussDate(DateUtil.parseDate(strDeathDiscussionVO.getDiscussDate()));//讨论时间
+            strDeathDiscussion.setRecordDate(DateUtil.parseDateTime(strDeathDiscussionVO.getRecordDate()));//病历日期
+
+            strDeathDiscussion.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strDeathDiscussion)){
+                strDeathDiscussion.setGmtCreate(new Date());//记录创建时间
+                this.save(strDeathDiscussion);
+            }else{
+                strDeathDiscussion.setGmtModified(new Date());//记录修改时间
+                this.update(strDeathDiscussion,new QueryWrapper<StrDeathDiscussion>()
+                        .eq("rec_id", strDeathDiscussion.getRecId())
+                        .eq("hospital_id", strDeathDiscussion.getHospitalId())
+                        .eq("behospital_code", strDeathDiscussion.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",strDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrDeathDiscussion strDeathDiscussion){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrDeathDiscussion>()
+                .eq("rec_id", strDeathDiscussion.getRecId())
+                .eq("hospital_id", strDeathDiscussion.getHospitalId())
+                .eq("behospital_code", strDeathDiscussion.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AStrDeathNoteFacade.java

@@ -0,0 +1,88 @@
+package com.diagbot.facade.data;
+
+import com.alibaba.fastjson.JSON;
+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.StrDeathNote;
+import com.diagbot.service.impl.StrDeathNoteServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.MapUtil;
+import com.diagbot.vo.data.AStrDeathNoteVO;
+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 AStrDeathNoteFacade extends StrDeathNoteServiceImpl {
+    @Autowired
+    private ColumnFacade columnFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    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,"strDeathNote");
+
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
+        if(!flag){
+            return;
+        }
+    }
+
+    //死亡记录
+    public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
+        StrDeathNote strDeathNote=new StrDeathNote();
+        try {
+            AStrDeathNoteVO strDeathNoteVO=(AStrDeathNoteVO) MapUtil.mapToObject(entityMap, AStrDeathNoteVO.class);
+            BeanUtils.copyProperties(strDeathNoteVO,strDeathNote);
+            strDeathNote.setHospitalId(hospitalId);//医院编码
+
+            strDeathNote.setAuditDate(DateUtil.parseDateTime(strDeathNoteVO.getAuditDate()));//审核时间
+            strDeathNote.setRecDate(DateUtil.parseDateTime(strDeathNoteVO.getRecDate()));//记录时间
+            strDeathNote.setBehospitalDate(DateUtil.parseDateTime(strDeathNoteVO.getBehospitalDate()));//入院日期
+            strDeathNote.setDeathDate(DateUtil.parseDate(strDeathNoteVO.getDeathDate()));//死亡日期
+            strDeathNote.setRecordDate(DateUtil.parseDateTime(strDeathNoteVO.getRecordDate()));//病历日期
+
+            strDeathNote.setWholeData(columnMap);
+            //判断数据库中是否存在，不存在insert
+            if(isExist(strDeathNote)){
+                strDeathNote.setGmtCreate(new Date());//记录创建时间
+                this.save(strDeathNote);
+            }else{
+                strDeathNote.setGmtModified(new Date());//记录修改时间
+                this.update(strDeathNote,new QueryWrapper<StrDeathNote>()
+                        .eq("rec_id", strDeathNote.getRecId())
+                        .eq("hospital_id", strDeathNote.getHospitalId())
+                        .eq("behospital_code", strDeathNote.getBehospitalCode()));
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", strDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
+        }
+
+    }
+
+    public Boolean isExist(StrDeathNote strDeathNote){
+        Boolean flag=true;
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrDeathNote>()
+                .eq("rec_id", strDeathNote.getRecId())
+                .eq("hospital_id", strDeathNote.getHospitalId())
+                .eq("behospital_code", strDeathNote.getBehospitalCode()));
+        if(count>0){
+            flag=false;
+        }
+        return flag;
+    }
+}

src/main/java/com/diagbot/facade/data/AMedDifficultCaseFacade.java

@@ -4,12 +4,12 @@ import com.alibaba.fastjson.JSON;
 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.entity.StrDifficultCase;
+import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.MapUtil;
-import com.diagbot.vo.data.AMedDifficultCaseVO;
+import com.diagbot.vo.data.AStrDifficultCaseVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
+public class AStrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -32,18 +32,18 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
         });
 
         Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
-        Boolean flag=columnFacade.createColumn(columnMap,"medDifficultCase");
+        Boolean flag=columnFacade.createColumn(columnMap,"strDifficultCase");
 
-        //Map<String, String> map=columnFacade.getColumn("medConsultationNote");
+        //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
         if(!flag){
             return;
         }
     }
 
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
-        MedDifficultCase medDifficult=new MedDifficultCase();
+        StrDifficultCase medDifficult=new StrDifficultCase();
         try {
-            AMedDifficultCaseVO medDifficultVO=(AMedDifficultCaseVO) MapUtil.mapToObject(entityMap, AMedDifficultCaseVO.class);
+            AStrDifficultCaseVO medDifficultVO=(AStrDifficultCaseVO) MapUtil.mapToObject(entityMap, AStrDifficultCaseVO.class);
             BeanUtils.copyProperties(medDifficultVO,medDifficult);
             medDifficult.setHospitalId(hospitalId);//医院编码
             medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
@@ -58,7 +58,7 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
                 this.save(medDifficult);
             }else{
                 medDifficult.setGmtModified(new Date());//记录修改时间
-                this.update(medDifficult,new QueryWrapper<MedDifficultCase>()
+                this.update(medDifficult,new QueryWrapper<StrDifficultCase>()
                         .eq("rec_id", medDifficult.getRecId())
                         .eq("hospital_id", medDifficult.getHospitalId())
                         .eq("behospital_code", medDifficult.getBehospitalCode()));
@@ -71,9 +71,9 @@ public class AMedDifficultCaseFacade extends MedDifficultCaseServiceImpl{
 
     }
 
-    public Boolean isExist(MedDifficultCase medDifficult){
+    public Boolean isExist(StrDifficultCase medDifficult){
         Boolean flag=true;
-        int count = this.baseMapper.selectCount(new QueryWrapper<MedDifficultCase>()
+        int count = this.baseMapper.selectCount(new QueryWrapper<StrDifficultCase>()
                 .eq("rec_id", medDifficult.getRecId())
                 .eq("hospital_id", medDifficult.getHospitalId())
                 .eq("behospital_code", medDifficult.getBehospitalCode()));