文书内容结构化重新调整

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

@@ -1,6 +1,7 @@
 package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.util.Date;
 import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.io.Serializable;
  * @since 2020-09-22
  */
 @TableName("med_death_discussion")
+@Data
 public class MedDeathDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -57,6 +59,19 @@ public class MedDeathDiscussion implements Serializable {
      * 科别
      */
     private String deptName;
+    //新增
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 死亡诊断
+     */
+    private String deathDiagnosis;
+
+  //还没新增完
 
     /**
      * 病历日期
@@ -163,242 +178,4 @@ public class MedDeathDiscussion implements Serializable {
      */
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getDeathReason() {
-        return deathReason;
-    }
-
-    public void setDeathReason(String deathReason) {
-        this.deathReason = deathReason;
-    }
-    public Date getDeathDate() {
-        return deathDate;
-    }
-
-    public void setDeathDate(Date deathDate) {
-        this.deathDate = deathDate;
-    }
-    public Date getDiscussDate() {
-        return discussDate;
-    }
-
-    public void setDiscussDate(Date discussDate) {
-        this.discussDate = discussDate;
-    }
-    public String getDiscussPlace() {
-        return discussPlace;
-    }
-
-    public void setDiscussPlace(String discussPlace) {
-        this.discussPlace = discussPlace;
-    }
-    public String getAnchor() {
-        return anchor;
-    }
-
-    public void setAnchor(String anchor) {
-        this.anchor = anchor;
-    }
-    public String getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-    public String getBriefHistory() {
-        return briefHistory;
-    }
-
-    public void setBriefHistory(String briefHistory) {
-        this.briefHistory = briefHistory;
-    }
-    public String getDiscussionContent() {
-        return discussionContent;
-    }
-
-    public void setDiscussionContent(String discussionContent) {
-        this.discussionContent = discussionContent;
-    }
-    public String getAnchorConclusion() {
-        return anchorConclusion;
-    }
-
-    public void setAnchorConclusion(String anchorConclusion) {
-        this.anchorConclusion = anchorConclusion;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "MedDeathDiscussion{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", deathReason=" + deathReason +
-            ", deathDate=" + deathDate +
-            ", discussDate=" + discussDate +
-            ", discussPlace=" + discussPlace +
-            ", anchor=" + anchor +
-            ", participant=" + participant +
-            ", briefHistory=" + briefHistory +
-            ", discussionContent=" + discussionContent +
-            ", anchorConclusion=" + anchorConclusion +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -312,7 +313,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedConsultationApply.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("behospital_date")
         );
 
@@ -321,7 +322,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedConsultationResult.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("behospital_date")
         );
 
@@ -330,7 +331,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedConsultationNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("behospital_date")
         );
 
@@ -339,7 +340,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedAdmissionNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("behospital_date")
         );
 
@@ -348,7 +349,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedBloodResult.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -357,7 +358,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedBloodTransfusion.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -366,7 +367,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedCrisisNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -375,7 +376,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedDeathDiscussion.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -384,7 +385,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedDeathNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("death_date")
         );
 
@@ -393,7 +394,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedDifficultCase.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -402,7 +403,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedFirstRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -411,7 +412,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedIllCritically.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("doctor_sign_date")
         );
 
@@ -420,7 +421,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedIllSeriousl.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("doctor_sign_date")
         );
 
@@ -429,7 +430,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedLeaveHospital.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("leave_hospital_date")
         );
 
@@ -438,7 +439,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedOperativeFirstRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -447,7 +448,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedOperativeNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -456,7 +457,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedPeriodConclusion.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -465,7 +466,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedPreoperativeDiscussion.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -474,7 +475,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedRescueNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 
@@ -483,7 +484,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedTransferInNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("transfer_in_date")
         );
 
@@ -492,7 +493,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedTransferOutNote.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("transfer_in_date")
         );
 
@@ -501,7 +502,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
-                .select(MedWardRecord.class, info -> !info.getColumn().equals("whole_data"))
+                .select("whole_data")
                 .orderByAsc("rec_date")
         );
 //        -------------------------------------文书数据改造结束----------------------------------
@@ -600,134 +601,112 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
          */
         //会诊申请单
         if (ListUtil.isNotEmpty(medConsultationApplyList)) {
-            addDataWithKeyConvert("会诊申请单", medConsultationApplyList, medrecVoList,  dicMap.get("23"),Arrays.asList("recordDate", "behospitalDate",
-                    "applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("会诊申请单", medConsultationApplyList, medrecVoList);
         }
 
         //会诊结果单
         if (ListUtil.isNotEmpty(medConsultationResultList)) {
-            addDataWithKeyConvert("会诊结果单", medConsultationResultList, medrecVoList,dicMap.get("24"), Arrays.asList("recordDate", "behospitalDate",
-                    "applyDate", "consultationArriveDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("会诊结果单", medConsultationResultList, medrecVoList);
         }
 
         //会诊单（申请和结果）
         if (ListUtil.isNotEmpty(medConsultationNoteList)) {
-            addDataWithKeyConvert("会诊单（申请和结果）", medConsultationNoteList, medrecVoList,dicMap.get("25"), Arrays.asList("recordDate", "behospitalDate",
-                    "applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("会诊单（申请和结果）", medConsultationNoteList, medrecVoList);
         }
 
         //入院记录
         if (ListUtil.isNotEmpty(medAdmissionNoteList)) {
-            addDataWithKeyConvert("入院记录", medAdmissionNoteList, medrecVoList,dicMap.get("26"), Arrays.asList("recordDate", "birthday", "behospitalDate",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("入院记录", medAdmissionNoteList, medrecVoList);
         }
 
         //输血效果评价
         if (ListUtil.isNotEmpty(medBloodResultList)) {
-            addDataWithKeyConvert("输血效果评价", medBloodResultList, medrecVoList,dicMap.get("27"), Arrays.asList("recordDate", "recDate", "auditDate",
-                    "gmtCreate", "gmtModified"));
+            newAddData("输血效果评价", medBloodResultList, medrecVoList);
         }
 
         //输血记录
         if (ListUtil.isNotEmpty(medBloodTransfusionList)) {
-            addDataWithKeyConvert("输血记录", medBloodTransfusionList, medrecVoList,dicMap.get("28"), Arrays.asList("recordDate", "startTime",
-                    "endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("输血记录", medBloodTransfusionList, medrecVoList);
         }
 
         //危急值记录
         if (ListUtil.isNotEmpty(medCrisisNoteList)) {
-            addDataWithKeyConvert("危急值记录", medCrisisNoteList, medrecVoList,dicMap.get("29"), Arrays.asList("recordDate", "recieveDate",
-                    "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("危急值记录", medCrisisNoteList, medrecVoList);
         }
 
         //死亡病例讨论记录
         if (ListUtil.isNotEmpty(medDeathDiscussionList)) {
-            addDataWithKeyConvert("死亡病例讨论记录", medDeathDiscussionList, medrecVoList,dicMap.get("30"), Arrays.asList("recordDate", "deathDate",
-                    "discussDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("死亡病例讨论记录", medDeathDiscussionList, medrecVoList);
         }
 
         //死亡记录
         if (ListUtil.isNotEmpty(medDeathNoteList)) {
-            addDataWithKeyConvert("死亡记录", medDeathNoteList, medrecVoList,dicMap.get("31"), Arrays.asList("recordDate", "behospitalDate",
-                    "deathDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("死亡记录", medDeathNoteList, medrecVoList);
         }
 
         //疑难病例讨论记录
         if (ListUtil.isNotEmpty(medDifficultCaseList)) {
-            addDataWithKeyConvert("疑难病例讨论记录", medDifficultCaseList, medrecVoList,dicMap.get("32"), Arrays.asList("recordDate", "discussDate",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("疑难病例讨论记录", medDifficultCaseList, medrecVoList);
         }
 
         //首次病程录
         if (ListUtil.isNotEmpty(medFirstRecordList)) {
-            addDataWithKeyConvert("首次病程录", medFirstRecordList, medrecVoList,dicMap.get("33"), Arrays.asList("recordDate", "behospitalDate",
-                    "applyDate", "consultationDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("首次病程录", medFirstRecordList, medrecVoList);
         }
 
         //病危通知单
         if (ListUtil.isNotEmpty(medIllCriticallyList)) {
-            addDataWithKeyConvert("病危通知单", medIllCriticallyList, medrecVoList, dicMap.get("34"),Arrays.asList("recordDate", "recDate",
-                    "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("病危通知单", medIllCriticallyList, medrecVoList);
         }
 
         //病重通知单
         if (ListUtil.isNotEmpty(medIllSeriouslList)) {
-            addDataWithKeyConvert("病重通知单", medIllSeriouslList, medrecVoList, dicMap.get("35"),Arrays.asList("recordDate", "patientSignDate",
-                    "doctorSignDate", "gmtCreate", "gmtModified"));
+            newAddData("病重通知单", medIllSeriouslList, medrecVoList);
         }
 
         //出院小结
         if (ListUtil.isNotEmpty(medLeaveHospitalList)) {
-            addDataWithKeyConvert("出院小结", medLeaveHospitalList, medrecVoList, dicMap.get("36"),Arrays.asList("recordDate", "behospitalDate",
-                    "leaveHospitalDate", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("出院小结", medLeaveHospitalList, medrecVoList);
         }
 
         //术后首程
         if (ListUtil.isNotEmpty(medOperativeFirstRecordList)) {
-            addDataWithKeyConvert("术后首程", medOperativeFirstRecordList, medrecVoList,dicMap.get("37"), Arrays.asList("recordDate", "operationDate",
-                    "startTime", "endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("术后首程", medOperativeFirstRecordList, medrecVoList);
         }
 
         //手术记录
         if (ListUtil.isNotEmpty(medOperativeNoteList)) {
-            addDataWithKeyConvert("手术记录", medOperativeNoteList, medrecVoList, dicMap.get("38"),Arrays.asList("recordDate", "operationDate",
-                    "startTime", "endTime", "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("手术记录", medOperativeNoteList, medrecVoList);
         }
 
         //阶段小结
         if (ListUtil.isNotEmpty(medPeriodConclusionList)) {
-            addDataWithKeyConvert("阶段小结", medPeriodConclusionList, medrecVoList,dicMap.get("39"), Arrays.asList("recordaDte", "recDate",
-                    "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("阶段小结", medPeriodConclusionList, medrecVoList);
         }
 
         //术前讨论小结
         if (ListUtil.isNotEmpty(medPreoperativeDiscussionList)) {
-            addDataWithKeyConvert("术前讨论小结", medPreoperativeDiscussionList, medrecVoList, dicMap.get("40"),Arrays.asList("recordDate", "discussTime",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("术前讨论小结", medPreoperativeDiscussionList, medrecVoList);
         }
 
         //抢救记录
         if (ListUtil.isNotEmpty(medRescueNoteList)) {
-            addDataWithKeyConvert("抢救记录", medRescueNoteList, medrecVoList,dicMap.get("41"),Arrays.asList("recordDate", "startTime", "endTime",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("抢救记录", medRescueNoteList, medrecVoList);
         }
 
         //转入记录
         if (ListUtil.isNotEmpty(medTransferInNoteList)) {
-            addDataWithKeyConvert("转入记录", medTransferInNoteList, medrecVoList,dicMap.get("42"), Arrays.asList("recordDate", "transferInDate",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("转入记录", medTransferInNoteList, medrecVoList);
         }
 
         //转出记录
         if (ListUtil.isNotEmpty(medTransferOutNoteList)) {
-            addDataWithKeyConvert("转出记录", medTransferOutNoteList, medrecVoList,dicMap.get("43"), Arrays.asList("recordDate", "transferInDate",
-                    "recDate", "auditDate", "gmtCreate", "gmtModified"));
+            newAddData("转出记录", medTransferOutNoteList, medrecVoList);
         }
 
         //查房记录
         if (ListUtil.isNotEmpty(medWardRecordList)) {
-            addDataWithKeyConvert("查房记录", medWardRecordList, medrecVoList, dicMap.get("44"),Arrays.asList("recordDate", "recDate", "auditDate",
-                    "gmtCreate", "gmtModified"));
+            newAddData("查房记录", medWardRecordList, medrecVoList);
         }
 
 
@@ -1063,6 +1042,35 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
+    /**
+     * 1.5.0拼接数据
+     *
+     * @param key
+     * @param list
+     * @param medrecVoList
+     */
+public <T> void newAddData(String key, List<T> list, List<MedrecVo> medrecVoList) {
+    MedrecVo medrecVo = new MedrecVo();
+    medrecVo.setTitle(key);
+    Map<String, Object> content = new HashMap<>();
+    //装入jason数据
+    List<String> contents = new ArrayList<>();
+    for (T bean : list) {
+        try {
+            Map<String, Object> objectMap = MapUtil.objectToMap(bean);
+            String jsonStr = (String) objectMap.get("wholeData");
+            contents.add(jsonStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    content.put("content", contents);
+    medrecVo.setContent(content);
+    medrecVoList.add(medrecVo);
+
+}
+
+
     /**
      * 拼接数据,从数据字典获取信息转换
      *
@@ -1077,11 +1085,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         medrecVo.setTitle(key);
         Map<String, Object> content = new HashMap<>();
         List<String> contents = new ArrayList<>();
-        //1.5.0判断定制过滤数据
-        if("结构化数据".equals(map.get("wholeData"))){
-        map.remove("wholeData");
-        }
-
         for (T bean : list) {
             try {
                 Map<String, String> res = new HashMap<>();