知情同意书，谈话告知书相关类添加

public/src/main/java/com/lantone/qc/pub/model/InputInfo.java

@@ -72,6 +72,10 @@ public class InputInfo {
     private List<StagesSummaryDoc> stagesSummaryDocs = new ArrayList<>();
     //查房记录
     private List<ThreeLevelWardDoc> threeLevelWardDocs = new ArrayList<>();
+    //知情同意书
+    private List<InformedConsentDoc> informedConsentDocs = new ArrayList<>();
+    //谈话告知书
+    private List<NoticeOfConversationDoc> noticeOfConversationDocs = new ArrayList<>();
     //麻醉相关
     private List<AnesthesiaRelatedDoc> anesthesiaRelatedDocs = new ArrayList<>();
     //有创操作记录

public/src/main/java/com/lantone/qc/pub/model/doc/InformedConsentDoc.java

@@ -0,0 +1,9 @@
+package com.lantone.qc.pub.model.doc;
+
+/**
+ * @Description: 知情同意书
+ * @author: wangyu
+ * @time: 2020/4/20 18:18
+ */
+public class InformedConsentDoc extends ModelDoc {
+}

public/src/main/java/com/lantone/qc/pub/model/doc/NoticeOfConversationDoc.java

@@ -0,0 +1,9 @@
+package com.lantone.qc.pub.model.doc;
+
+/**
+ * @Description: 谈话告知书
+ * @author: wangyu
+ * @time: 2020/4/20 18:18
+ */
+public class NoticeOfConversationDoc extends ModelDoc {
+}

trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouDocTrans.java

@@ -7,8 +7,6 @@ import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.trans.DocTrans;
 
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -42,7 +40,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "输血/血制品病程记录":
                     TaiZhouClinicalBloodDocTrans clinicalBloodDocTrans = new TaiZhouClinicalBloodDocTrans();
-                    inputInfo.setClinicalBloodDocs(clinicalBloodDocTrans.extract(i));
+                   /* inputInfo.setClinicalBloodDocs(clinicalBloodDocTrans.extract(i));*/
                     break;
                 case "危急值记录":
                     TaiZhouCrisisValueReportDocTrans crisisValueReportDocTrans = new TaiZhouCrisisValueReportDocTrans();
@@ -50,7 +48,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "病危通知书":
                     TaiZhouCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new TaiZhouCriticallyIllNoticeDocTrans();
-                    inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i));
+                    inputInfo.setCriticallyIllNoticeDocs(criticallyIllNoticeDocTrans.extract(i)); 
                     break;
                 case "死亡病例讨论记录":
                     TaiZhouDeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new TaiZhouDeathCaseDiscussDocTrans();
@@ -62,7 +60,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "疑难病例讨论记录":
                     TaiZhouDifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new TaiZhouDifficultCaseDiscussDocTrans();
-                    inputInfo.setDifficultCaseDiscussDocs(difficultCaseDiscussDocTrans.extract(i));
+                  /*  inputInfo.setDifficultCaseDiscussDocs(difficultCaseDiscussDocTrans.extract(i));*/
                     break;
                 case "医嘱信息":
                     TaiZhouDoctorAdviceDocTrans doctorAdviceDocTrans = new TaiZhouDoctorAdviceDocTrans();
@@ -78,7 +76,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "病案首页":
                     TaiZhouFirstPageRecordDocTrans firstPageRecordDocTrans = new TaiZhouFirstPageRecordDocTrans();
-                    if (inputInfo.getFirstPageRecordDoc() == null) {
+                    if(inputInfo.getFirstPageRecordDoc() == null){
                         inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
                     }
                     break;
@@ -92,7 +90,7 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                 case "抢救记录":
                     TaiZhouRescueDocTrans rescueDocTrans = new TaiZhouRescueDocTrans();
-                    inputInfo.setRescueDocs(rescueDocTrans.extract(i));
+                   /* inputInfo.setRescueDocs(rescueDocTrans.extract(i));*/
                     break;
                 case "病重通知书":
                     TaiZhouSeriouslyIllNoticeDocTrans seriouslyIllNoticeDocTrans = new TaiZhouSeriouslyIllNoticeDocTrans();
@@ -106,13 +104,13 @@ public class TaizhouDocTrans extends DocTrans {
                     TaiZhouThreeLevelWardDocTrans threeLevelWardDocTrans = new TaiZhouThreeLevelWardDocTrans();
                     inputInfo.setThreeLevelWardDocs(threeLevelWardDocTrans.extract(i));
                     break;
-                case "输血后效果评价":
-                    TaiZhouClinicBloodEffectDocTrans clinicBloodEffectDocTrans = new TaiZhouClinicBloodEffectDocTrans();
-                    inputInfo.setClinicBloodEffectDocs(clinicBloodEffectDocTrans.extract(i));
+                case "知情同意书":
+                    TaizhouInformedConsentDocTrans taizhouInformedConsentDocTrans = new TaizhouInformedConsentDocTrans();
+                    inputInfo.setInformedConsentDocs(taizhouInformedConsentDocTrans.extract(i));
                     break;
-                case "病理检验送检单":
-                    TaiZhouPathologyShipDocTrans pathologyShipDocTrans = new TaiZhouPathologyShipDocTrans();
-                    inputInfo.setPathologyShipDocs(pathologyShipDocTrans.extract(i));
+                case "谈话告知书":
+                    TaizhouNoticeOfConversationDocTrans taizhouNoticeOfConversationDocTrans = new TaizhouNoticeOfConversationDocTrans();
+                    inputInfo.setNoticeOfConversationDocs(taizhouNoticeOfConversationDocTrans.extract(i));
                     break;
                 default:
                     break;
@@ -148,18 +146,15 @@ public class TaizhouDocTrans extends DocTrans {
         if (ListUtil.isNotEmpty(inputInfo.getClinicalBloodDocs())) {
             inputInfo.getPageData().put("输血/血制品病程记录", inputInfo.getClinicalBloodDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
-        if (ListUtil.isNotEmpty(inputInfo.getClinicBloodEffectDocs())) {
-            inputInfo.getPageData().put("输血后效果评价", inputInfo.getClinicBloodEffectDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        }
         if (ListUtil.isNotEmpty(inputInfo.getCrisisValueReportDocs())) {
             inputInfo.getPageData().put("危急值记录", inputInfo.getCrisisValueReportDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getCriticallyIllNoticeDocs())) {
             inputInfo.getPageData().put("病危通知书", inputInfo.getCriticallyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
-        if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
-            inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        }
+        //        if (ListUtil.isNotEmpty(inputInfo.getDifficultCaseDiscussDocs())) {
+        //            inputInfo.getPageData().put("疑难病例讨论记录", inputInfo.getDifficultCaseDiscussDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+        //        }
         //        if (ListUtil.isNotEmpty(inputInfo.getDoctorAdviceDocs())) {
         //            inputInfo.getPageData().put("医嘱信息", inputInfo.getDoctorAdviceDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         //        }
@@ -176,86 +171,76 @@ public class TaizhouDocTrans extends DocTrans {
             inputInfo.getPageData().put("阶段小结", inputInfo.getStagesSummaryDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
         if (ListUtil.isNotEmpty(inputInfo.getThreeLevelWardDocs())) {
-            inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        }
-        if (ListUtil.isNotEmpty(inputInfo.getPathologyShipDocs())) {
-            inputInfo.getPageData().put("病理检验送检单", inputInfo.getPathologyShipDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+            inputInfo.getPageData().put("查房记录", inputInfo.getThreeLevelWardDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
 
         if (ListUtil.isNotEmpty(inputInfo.getConsultationDocs())) {
-            List<Map<String, Object>> crePageDataList = inputInfo.getConsultationDocs()
-                    .stream()
-                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
-                    .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(crePageDataList)) {
-                inputInfo.getPageData().put("会诊记录", crePageDataList);
-            }
-
-            List<Map<String, Object>> caPageDataList = inputInfo.getConsultationDocs()
-                    .stream()
-                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
-                    .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(caPageDataList)) {
-                inputInfo.getPageData().put("会诊申请单", caPageDataList);
-            }
-
-            List<Map<String, Object>> crsPageDataList = inputInfo.getConsultationDocs()
-                    .stream()
-                    .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
-                    .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(crsPageDataList)) {
-                inputInfo.getPageData().put("会诊结果单", crsPageDataList);
-            }
+            inputInfo.getPageData().put(
+                    "会诊记录",
+                    inputInfo.getConsultationDocs()
+                            .stream()
+                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationRecordDoc() != null)
+                            .map(consultationDoc -> consultationDoc.getConsultationRecordDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "会诊申请单",
+                    inputInfo.getConsultationDocs()
+                            .stream()
+                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationApplicationDoc() != null)
+                            .map(consultationDoc -> consultationDoc.getConsultationApplicationDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "会诊结果单",
+                    inputInfo.getConsultationDocs()
+                            .stream()
+                            .filter(consultationDoc -> consultationDoc != null && consultationDoc.getConsultationResultsDoc() != null)
+                            .map(consultationDoc -> consultationDoc.getConsultationResultsDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
         }
         if (ListUtil.isNotEmpty(inputInfo.getOperationDocs())) {
-            List<Map<String, Object>> odPageDataList = inputInfo.getOperationDocs()
-                    .stream()
-                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
-                    .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(odPageDataList)) {
-                inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
-            }
-
-            List<Map<String, Object>> orPageDataList = inputInfo.getOperationDocs()
-                    .stream()
-                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
-                    .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(orPageDataList)) {
-                inputInfo.getPageData().put("手术记录", orPageDataList);
-            }
-
-            List<Map<String, Object>> pdPageDataList = inputInfo.getOperationDocs()
-                    .stream()
-                    .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
-                    .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(pdPageDataList)) {
-                inputInfo.getPageData().put("术前讨论、术前小结", pdPageDataList);
-            }
-
-            List<Map<String, Object>> oicPageDataList = inputInfo.getOperationDocs()
-                    .stream()
-                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
-                    .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(oicPageDataList)) {
-                inputInfo.getPageData().put("手术知情同意书", oicPageDataList);
-            }
-
-            List<Map<String, Object>> oscPageDataList = inputInfo.getOperationDocs()
-                    .stream()
-                    .filter(operationDoc -> operationDoc != null && operationDoc.getOperationSafetyChecklistDoc() != null)
-                    .map(operationDoc -> operationDoc.getOperationSafetyChecklistDoc().getPageData())
-                    .collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(oscPageDataList)) {
-                inputInfo.getPageData().put("手术安全核查表", oscPageDataList);
-            }
+            inputInfo.getPageData().put(
+                    "术后首次病程及谈话记录",
+                    inputInfo.getOperationDocs()
+                            .stream()
+                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
+                            .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "手术记录",
+                    inputInfo.getOperationDocs()
+                            .stream()
+                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
+                            .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "术前讨论、术前小结",
+                    inputInfo.getOperationDocs()
+                            .stream()
+                            .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
+                            .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "手术知情同意书",
+                    inputInfo.getOperationDocs()
+                            .stream()
+                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationInformedConsentDoc() != null)
+                            .map(operationDoc -> operationDoc.getOperationInformedConsentDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
+            inputInfo.getPageData().put(
+                    "手术安全核查表",
+                    inputInfo.getOperationDocs()
+                            .stream()
+                            .filter(operationDoc -> operationDoc != null && operationDoc.getOperationSafetyChecklistDoc() != null)
+                            .map(operationDoc -> operationDoc.getOperationSafetyChecklistDoc().getPageData())
+                            .collect(Collectors.toList())
+            );
         }
     }
-
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouInformedConsentDocTrans.java

@@ -0,0 +1,21 @@
+package com.lantone.qc.trans.taizhou;
+
+import com.lantone.qc.pub.model.doc.InformedConsentDoc;
+import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.trans.ModelDocTrans;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 知情同意书
+ * @author: wangyu
+ * @time: 2020/4/20 17:48
+ */
+public class TaizhouInformedConsentDocTrans extends ModelDocTrans {
+    @Override
+    public List<InformedConsentDoc> extract(MedrecVo medrecVo) {
+        List<InformedConsentDoc> informedConsentDocs = new ArrayList<>();
+        return informedConsentDocs;
+    }
+}

trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouNoticeOfConversationDocTrans.java

@@ -0,0 +1,21 @@
+package com.lantone.qc.trans.taizhou;
+
+import com.lantone.qc.pub.model.doc.NoticeOfConversationDoc;
+import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.trans.ModelDocTrans;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 谈话告知书
+ * @author: wangyu
+ * @time: 2020/4/20 18:06
+ */
+public class TaizhouNoticeOfConversationDocTrans extends ModelDocTrans {
+    @Override
+    public List<NoticeOfConversationDoc> extract(MedrecVo medrecVo) {
+        List<NoticeOfConversationDoc> noticeOfConversationDocs = new ArrayList<>();
+        return noticeOfConversationDocs;
+    }
+}