删除无用代码

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDailyCourseRecordDocTrans.java

@@ -1,56 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
-import com.lantone.qc.pub.model.doc.DailyCourseRecordDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.comsis.Preproc;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 日常病程录文档生成
- * @author: rengb
- * @time: 2020/3/17 17:34
- */
-public class BeiLunDailyCourseRecordDocTrans extends ModelDocTrans {
-
-    @Override
-    public List<DailyCourseRecordDoc> extract(MedrecVo medrecVo) {
-        List<DailyCourseRecordDoc> retList = Lists.newArrayList();
-        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
-        contentMaps.forEach(contentMap -> {
-            retList.add(getDailyCourseRecordDoc(contentMap));
-        });
-        return retList;
-    }
-
-    private DailyCourseRecordDoc getDailyCourseRecordDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
-
-        String text = CxXmlUtil.getXmlText(content);
-        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, sourceTitles, text);
-        cutWordMap.putAll(structureMap);
-
-        DailyCourseRecordDoc dailyCourseRecordDoc = new DailyCourseRecordDoc();
-        dailyCourseRecordDoc.setText(text);
-        dailyCourseRecordDoc.setPageData((Map) cutWordMap);
-
-        return dailyCourseRecordDoc;
-    }
-
-    private List<String> sourceTitles = Lists.newArrayList();
-
-    private List<String> keyContrasts = Lists.newArrayList(
-            "日常病程记录++++文本框=病程记录内容",
-            "签名++++=签名"
-    );
-
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunInformedConsentDocTrans.java

@@ -1,18 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.lantone.qc.pub.model.doc.InformedConsentDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-
-/**
- * @Description: 知情同意书
- * @author: wangyu
- * @time: 2020/4/20 17:48
- */
-public class BeiLunInformedConsentDocTrans extends ModelDocTrans {
-    @Override
-    public InformedConsentDoc extract(MedrecVo medrecVo) {
-        InformedConsentDoc informedConsentDoc = new InformedConsentDoc();
-        return informedConsentDoc;
-    }
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunNoticeOfConversationDocTrans.java

@@ -1,20 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.lantone.qc.pub.model.doc.NoticeOfConversationDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-
-/**
- * @Description: 谈话告知书
- * @author: wangyu
- * @time: 2020/4/20 18:06
- */
-public class BeiLunNoticeOfConversationDocTrans extends ModelDocTrans {
-    @Override
-    public NoticeOfConversationDoc extract(MedrecVo medrecVo) {
-        NoticeOfConversationDoc noticeOfConversationDoc = new NoticeOfConversationDoc();
-//        List<String> noticeofConverstartons = (List<String>) medrecVo.getContent().get("content");
-//        noticeOfConversationDoc.setAllNoticeOfConverstartion(noticeofConverstartons);
-        return noticeOfConversationDoc;
-    }
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunNursingSystemDocTrans.java

@@ -1,69 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.google.common.collect.Lists;
-import com.lantone.qc.pub.model.doc.NursingSystemDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.comsis.Preproc;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 分级护理制度文档生成
- * @author: rengb
- * @time: 2020/3/17 13:26
- */
-public class BeiLunNursingSystemDocTrans extends ModelDocTrans {
-
-    @Override
-    public NursingSystemDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
-
-        Map<String, String> pageData = Preproc.extract_doc_pub(true, pageDataTitles, content);
-        pageData.put("病程记录内容",
-                pageData.get("病程记录内容")
-                        .replace(pageData.get("病程记录时间"), "")
-                        .replace(pageData.get("病程记录名称"), "")
-        );
-
-        List<String> targetTitles = Lists.newArrayList();
-        sourceTitles.forEach(sourceTitle -> {
-            String targetTitle = "";
-            for (int index = 0; index < sourceTitle.length(); index++) {
-                if (index == sourceTitle.length() - 1) {
-                    targetTitle += sourceTitle.substring(index, index + 1);
-                } else {
-                    targetTitle += sourceTitle.substring(index, index + 1) + "[\\s\\p{Zs}]*";
-                }
-            }
-            targetTitles.add(targetTitle);
-        });
-
-        Map<String, String> sourceMap = Preproc.extract_doc_pub(true, targetTitles, content);
-        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
-
-        NursingSystemDoc nursingSystemDoc = ModelDocGenerate.nursingSystemDocGen(sourceMap);
-        nursingSystemDoc.setText(content);
-        nursingSystemDoc.setPageData((Map) pageData);
-
-        return nursingSystemDoc;
-    }
-
-    private List<String> pageDataTitles = Lists.newArrayList(
-            "病程记录时间",
-            "病程记录名称",
-            "病程记录内容",
-            "记录医师"
-    );
-
-    private List<String> sourceTitles = Lists.newArrayList(
-            "病程记录时间",
-            "病程记录名称",
-            "病程记录内容",
-            "记录时间",
-            "记录医师"
-    );
-
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -3,12 +3,9 @@ package com.lantone.qc.trans.beilun;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
 import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.model.doc.operation.OperationInformedConsentDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
-import com.lantone.qc.pub.model.doc.operation.OperationSafetyChecklistDoc;
 import com.lantone.qc.pub.model.doc.operation.PreoperativeDiscussionDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.ListUtil;
@@ -20,7 +17,6 @@ import com.lantone.qc.trans.beilun.util.BeiLunOperationRecordHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunPreoperativeHtmlAnalysis;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-import com.lantone.qc.trans.comsis.Preproc;
 
 import java.util.List;
 import java.util.Map;
@@ -45,15 +41,11 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         Map<String, OperationDiscussionDoc> operationDiscussionDocMap = getOperationDiscussionDocMap((List) contentMap.get("术后首次病程及谈话记录"));
         Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap((List) contentMap.get("手术记录"));
         Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap((List) contentMap.get("术前讨论、术前小结"));
-        //Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap((List) contentMap.get("手术知情同意书"));
-        //Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap((List) contentMap.get("手术安全核查表"));
 
         Set<String> operationNameSet = Sets.newHashSet();
         operationNameSet.addAll(operationDiscussionDocMap.keySet());
         operationNameSet.addAll(operationRecordDocMap.keySet());
         operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
-        //operationNameSet.addAll(operationInformedConsentDocMap.keySet());
-        //operationNameSet.addAll(operationSafetyChecklistDocMap.keySet());
 
         operationNameSet.forEach(operationName -> {
             OperationDoc operationDoc = new OperationDoc();
@@ -61,8 +53,6 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             operationDoc.setOperationDiscussionDoc(operationDiscussionDocMap.get(operationName));
             operationDoc.setOperationRecordDoc(operationRecordDocMap.get(operationName));
             operationDoc.setPreoperativeDiscussionDoc(preoperativeDiscussionDocMap.get(operationName));
-            //operationDoc.setOperationInformedConsentDoc(operationInformedConsentDocMap.get(operationName));
-            //operationDoc.setOperationSafetyChecklistDoc(operationSafetyChecklistDocMap.get(operationName));
             retList.add(operationDoc);
         });
 
@@ -192,143 +182,11 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
-        "术中、术后注意事项（含护理事项）=术后注意事项",
-        "拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
-        "术前特殊准备=术前准备",
-        "手术指征与禁忌征=手术指征与禁忌",
-        "经治医生签字时间=记录时间"
-    );
-
-
-    /**********************************************手术知情同意书****************************************************/
-    private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<Map<String, Object>> contentMaps) {
-        Map<String, OperationInformedConsentDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contentMaps)) {
-            return retMap;
-        }
-        int index = 1;
-        String operationName = null;
-        for (Map<String, Object> contentMap : contentMaps) {
-            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
-                continue;
-            }
-            operationName = index + "";
-            OperationInformedConsentDoc operationInformedConsentDoc = getOperationInformedConsentDoc(contentMap);
-            operationInformedConsentDoc.setOperationName(operationName);
-            retMap.put(operationName, operationInformedConsentDoc);
-            index++;
-        }
-        return retMap;
-    }
-
-    private OperationInformedConsentDoc getOperationInformedConsentDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationInformedConsent_keyContrasts);
-
-        String text = CxXmlUtil.getXmlText(content);
-        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationInformedConsent_sourceTitles, text);
-        cutWordMap.putAll(structureMap);
-
-        OperationInformedConsentDoc operationInformedConsentDoc = ModelDocGenerate.operationInformedConsentDocGen(cutWordMap);
-        operationInformedConsentDoc.setText(text);
-        operationInformedConsentDoc.setPageData((Map) cutWordMap);
-
-        return operationInformedConsentDoc;
-    }
-
-    private List<String> operationInformedConsent_sourceTitles = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "病区",
-            "床号",
-            "病案号",
-            "手术医生",
-            "目前诊断",
-            "手术名称",
-            "手术指征",
-            "风险及并发症",
-            "保守治疗",
-            "其他手术",
-            "签名",
-            "签名时间"
-    );
-
-    private List<String> operationInformedConsent_keyContrasts = Lists.newArrayList(
-            "姓名++++患者姓名=姓名",
-            "性别=",
-            "病区++++病区名称=病区",
-            "床号=",
-            "病案号++++住院号=病案号",
-            "手术医生=",
-            "目前诊断=",
-            "手术名称=",
-            "手术指征=",
-            "风险及并发症=",
-            "++++保守治疗=保守治疗",
-            "++++其他手术=其他手术",
-            "签名++++=签名",
-            "签名时间=签名时间"
-    );
-
-
-    /**********************************************手术安全核查表****************************************************/
-    private Map<String, OperationSafetyChecklistDoc> getOperationSafetyChecklistDocMap(List<Map<String, Object>> contentMaps) {
-        Map<String, OperationSafetyChecklistDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contentMaps)) {
-            return retMap;
-        }
-        int index = 1;
-        String operationName = null;
-        for (Map<String, Object> contentMap : contentMaps) {
-            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
-                continue;
-            }
-            operationName = index + "";
-            OperationSafetyChecklistDoc operationSafetyChecklistDoc = getOperationSafetyChecklistDoc(contentMap);
-            operationSafetyChecklistDoc.setOperationName(operationName);
-            retMap.put(operationName, operationSafetyChecklistDoc);
-            index++;
-        }
-        return retMap;
-    }
-
-    private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
-        Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts);
-
-        String text = CxXmlUtil.getXmlText(content);
-        Map<String, String> cutWordMap = Preproc.getCutWordMap(true, operationSafetyChecklist_sourceTitles, text);
-        cutWordMap.putAll(structureMap);
-
-        OperationSafetyChecklistDoc operationSafetyChecklistDoc = ModelDocGenerate.operationSafetyChecklistDocGen(cutWordMap);
-        operationSafetyChecklistDoc.setText(text);
-        operationSafetyChecklistDoc.setPageData((Map) cutWordMap);
-
-        return operationSafetyChecklistDoc;
-    }
-
-    private List<String> operationSafetyChecklist_sourceTitles = Lists.newArrayList(
-            "姓名",
-            "性别",
-            "病区",
-            "床号",
-            "病案号",
-            "签名"
-    );
-
-    private List<String> operationSafetyChecklist_keyContrasts = Lists.newArrayList(
-            "姓名++++患者姓名=姓名",
-            "性别",
-            "病区",
-            "床号",
-            "病案号++++住院号=病案号",
-            "签名++++=签名"
+            "术中、术后注意事项（含护理事项）=术后注意事项",
+            "拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
+            "术前特殊准备=术前准备",
+            "手术指征与禁忌征=手术指征与禁忌",
+            "经治医生签字时间=记录时间"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunPathologyShipDocTrans.java

@@ -1,60 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
-import com.lantone.qc.pub.model.doc.PathologyShipDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.comsis.OrdinaryAssistant;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : PathologyShipDocTrans
- * @Description : 病理检验送检单
- * @Author : 楼辉荣
- * @Date: 2020-04-19 17:49
- */
-public class BeiLunPathologyShipDocTrans extends ModelDocTrans {
-    @Override
-    public List<PathologyShipDoc> extract(MedrecVo medrecVo) {
-        List<PathologyShipDoc> retList = Lists.newArrayList();
-        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
-        contentMaps.forEach(contentMap -> {
-            retList.add(getPathologyShipDoc(contentMap));
-        });
-        return retList;
-    }
-
-    private PathologyShipDoc getPathologyShipDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
-        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-
-        PathologyShipDoc pathologyShipDoc = new PathologyShipDoc();
-        pathologyShipDoc.setStructureMap(structureMap);
-        pathologyShipDoc.setPageData((Map) structureMap);
-        return pathologyShipDoc;
-    }
-
-    private List<String> keyContrasts = Lists.newArrayList(
-            "姓名++++患者姓名=姓名",
-            "病案号++++住院号=病案号",
-            "病区++++病区名称=病区",
-            "数量=标本件数",
-            "医师=送检医师",
-            "++++送检材料=送检标本名称",
-            "++++标本送检时间=标本离体时间",
-            "++++取材部位=送检组织取材部位",
-            "联系地址=病人详细通讯地址",
-            "检查结果=辅助检查结果",
-            "手术所见=术中发现",
-            "传染性标本=是否为传染性标本",
-            "日期=检验日期",
-            "++++月经日期=末次月经日期"
-    );
-
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunSeriouslyIllNoticeDocTrans.java

@@ -1,76 +0,0 @@
-package com.lantone.qc.trans.beilun;
-
-import com.google.common.collect.Lists;
-import com.lantone.qc.pub.model.doc.SeriouslyIllNoticeDoc;
-import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.trans.ModelDocTrans;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.comsis.Preproc;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 病重通知书文档生成
- * @author: rengb
- * @time: 2020/3/19 19:41
- */
-public class BeiLunSeriouslyIllNoticeDocTrans extends ModelDocTrans {
-
-    @Override
-    public List<SeriouslyIllNoticeDoc> extract(MedrecVo medrecVo) {
-        List<SeriouslyIllNoticeDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getSeriouslyIllNoticeDoc(content));
-        });
-        return retList;
-    }
-
-    private SeriouslyIllNoticeDoc getSeriouslyIllNoticeDoc(String content) {
-        Map<String, String> pageData = Preproc.extract_doc_pub(true, pageDataTitles, content);
-        pageData.put("病程记录内容",
-                pageData.get("病程记录内容")
-                        .replace(pageData.get("病程记录时间"), "")
-                        .replace(pageData.get("病程记录名称"), "")
-        );
-
-        List<String> targetTitles = Lists.newArrayList();
-        sourceTitles.forEach(sourceTitle -> {
-            String targetTitle = "";
-            for (int index = 0; index < sourceTitle.length(); index++) {
-                if (index == sourceTitle.length() - 1) {
-                    targetTitle += sourceTitle.substring(index, index + 1);
-                } else {
-                    targetTitle += sourceTitle.substring(index, index + 1) + "[\\s\\p{Zs}]*";
-                }
-            }
-            targetTitles.add(targetTitle);
-        });
-
-        Map<String, String> sourceMap = Preproc.extract_doc_pub(true, targetTitles, content);
-        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
-
-        SeriouslyIllNoticeDoc seriouslyIllNoticeDoc = ModelDocGenerate.seriouslyIllNoticeDocGen(sourceMap);
-        seriouslyIllNoticeDoc.setText(content);
-        seriouslyIllNoticeDoc.setPageData((Map) pageData);
-
-        return seriouslyIllNoticeDoc;
-    }
-
-    private List<String> pageDataTitles = Lists.newArrayList(
-            "病程记录时间",
-            "病程记录名称",
-            "病程记录内容",
-            "记录医师"
-    );
-
-    private List<String> sourceTitles = Lists.newArrayList(
-            "病程记录时间",
-            "病程记录名称",
-            "病程记录内容",
-            "记录时间",
-            "记录医师"
-    );
-
-}

trans/src/main/java/com/lantone/qc/trans/beilun/BeilunDocTrans.java

@@ -45,16 +45,16 @@ public class BeilunDocTrans extends DocTrans {
                 inputInfo.setClinicalBloodDocs(clinicalBloodDocTrans.extract(i));
             }
             if (i.getTitle().equals("输血后效果评价")) {
-                BeiLunClinicBloodEffectDocTrans changxClinicBloodEffectDocTrans = new BeiLunClinicBloodEffectDocTrans();
-                inputInfo.setClinicBloodEffectDocs(changxClinicBloodEffectDocTrans.extract(i));
+                BeiLunClinicBloodEffectDocTrans clinicBloodEffectDocTrans = new BeiLunClinicBloodEffectDocTrans();
+                inputInfo.setClinicBloodEffectDocs(clinicBloodEffectDocTrans.extract(i));
             }
             if (i.getTitle().equals("危急值记录")) {
                 BeiLunCrisisValueReportDocTrans crisisValueReportDocTrans = new BeiLunCrisisValueReportDocTrans();
                 inputInfo.setCrisisValueReportDocs(crisisValueReportDocTrans.extract(i));
             }
             if (i.getTitle().equals("危急值")) {
-                BeiLunCrisisInfoDocTrans changxCrisisInfoDocTrans = new BeiLunCrisisInfoDocTrans();
-                inputInfo.setCrisisInfoDocs(changxCrisisInfoDocTrans.extract(i));
+                BeiLunCrisisInfoDocTrans crisisInfoDocTrans = new BeiLunCrisisInfoDocTrans();
+                inputInfo.setCrisisInfoDocs(crisisInfoDocTrans.extract(i));
             }
             if (i.getTitle().equals("病危通知书")) {
                 BeiLunCriticallyIllNoticeDocTrans criticallyIllNoticeDocTrans = new BeiLunCriticallyIllNoticeDocTrans();
@@ -76,10 +76,10 @@ public class BeilunDocTrans extends DocTrans {
                 BeiLunDoctorAdviceDocTrans doctorAdviceDocTrans = new BeiLunDoctorAdviceDocTrans();
                 inputInfo.setDoctorAdviceDocs(doctorAdviceDocTrans.extract(i));
             }
-            //            if (i.getTitle().equals("值班交接制度")) {
-            //                ChangxDutyShiftSystemDocTrans dutyShiftSystemDocTrans = new ChangxDutyShiftSystemDocTrans();
-            //                inputInfo.setDutyShiftSystemDocs(dutyShiftSystemDocTrans.extract(i));
-            //            }
+            if (i.getTitle().equals("值班交接制度")) {
+                BeiLunDutyShiftSystemDocTrans dutyShiftSystemDocTrans = new BeiLunDutyShiftSystemDocTrans();
+                inputInfo.setDutyShiftSystemDocs(dutyShiftSystemDocTrans.extract(i));
+            }
             if (i.getTitle().equals("首次病程录")) {
                 BeiLunFirstCourseRecordDocTrans firstCourseRecordDocTrans = new BeiLunFirstCourseRecordDocTrans();
                 inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
@@ -92,18 +92,10 @@ public class BeilunDocTrans extends DocTrans {
                 BeiLunLeaveHospitalDocTrans leaveHospitalDocTrans = new BeiLunLeaveHospitalDocTrans();
                 inputInfo.setLeaveHospitalDoc(leaveHospitalDocTrans.extract(i));
             }
-            //            if (i.getTitle().equals("分级护理制度")) {
-            //                ChangxNursingSystemDocTrans nursingSystemDocTrans = new ChangxNursingSystemDocTrans();
-            //                inputInfo.setNursingSystemDoc(nursingSystemDocTrans.extract(i));
-            //            }
             if (i.getTitle().equals("抢救记录")) {
                 BeiLunRescueDocTrans rescueDocTrans = new BeiLunRescueDocTrans();
                 inputInfo.setRescueDocs(rescueDocTrans.extract(i));
             }
-            //            if (i.getTitle().equals("病重通知书")) {
-            //                ChangxSeriouslyIllNoticeDocTrans seriouslyIllNoticeDocTrans = new ChangxSeriouslyIllNoticeDocTrans();
-            //                inputInfo.setSeriouslyIllNoticeDocs(seriouslyIllNoticeDocTrans.extract(i));
-            //            }
             if (i.getTitle().equals("阶段小结")) {
                 BeiLunStagesSummaryDocTrans stagesSummaryDocTrans = new BeiLunStagesSummaryDocTrans();
                 inputInfo.setStagesSummaryDocs(stagesSummaryDocTrans.extract(i));
@@ -113,33 +105,17 @@ public class BeilunDocTrans extends DocTrans {
                 threeLevelWardDocTrans.setOperationDocs(inputInfo.getOperationDocs());
                 inputInfo.setThreeLevelWardDocs(threeLevelWardDocTrans.extract(i));
             }
-            if (i.getTitle().equals("病理检验送检单")) {
-                BeiLunPathologyShipDocTrans pathologyShipDocTrans = new BeiLunPathologyShipDocTrans();
-                inputInfo.setPathologyShipDocs(pathologyShipDocTrans.extract(i));
-            }
-            //            if (i.getTitle().equals("知情同意书")) {
-            //                ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
-            //                inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
-            //            }
-            //            if (i.getTitle().equals("谈话告知书")) {
-            //                ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
-            //                inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
-            //            }
-            if (i.getTitle().equals("日常病程录")) {
-                BeiLunDailyCourseRecordDocTrans dailyCourseRecordDocTrans = new BeiLunDailyCourseRecordDocTrans();
-                inputInfo.setDailyCourseRecordDocs(dailyCourseRecordDocTrans.extract(i));
-            }
             if (i.getTitle().equals("住院病历信息")) {
                 BeiLunMedicalRecordInfoDocTrans medicalRecordInfoDocTrans = new BeiLunMedicalRecordInfoDocTrans();
                 inputInfo.setMedicalRecordInfoDoc(medicalRecordInfoDocTrans.extract(i));
             }
             if (i.getTitle().equals("化验")) {
-                BeiLunLisDocTrans changxLisDocTrans = new BeiLunLisDocTrans();
-                inputInfo.setLisDocs(changxLisDocTrans.extract(i));
+                BeiLunLisDocTrans lisDocTrans = new BeiLunLisDocTrans();
+                inputInfo.setLisDocs(lisDocTrans.extract(i));
             }
             if (i.getTitle().equals("门诊")) {
-                BeiLunOutDepDocTrans changxOutDepDocTrans = new BeiLunOutDepDocTrans();
-                inputInfo.setBeHospitalizedDoc(changxOutDepDocTrans.extract(i));
+                BeiLunOutDepDocTrans outDepDocTrans = new BeiLunOutDepDocTrans();
+                inputInfo.setBeHospitalizedDoc(outDepDocTrans.extract(i));
             }
         }
         pageDataHandle(inputInfo);
@@ -162,9 +138,6 @@ public class BeilunDocTrans extends DocTrans {
         if (inputInfo.getLeaveHospitalDoc() != null) {
             inputInfo.getPageData().put("出院小结", Lists.newArrayList(inputInfo.getLeaveHospitalDoc().getPageData()));
         }
-        //        if (inputInfo.getNursingSystemDoc() != null) {
-        //            inputInfo.getPageData().put("分级护理制度", Lists.newArrayList(inputInfo.getNursingSystemDoc().getPageData()));
-        //        }
         if (inputInfo.getFirstPageRecordDoc() != null) {
             inputInfo.getPageData().put("病案首页", Lists.newArrayList(inputInfo.getFirstPageRecordDoc().getPageData()));
         }
@@ -191,31 +164,18 @@ public class BeilunDocTrans extends DocTrans {
         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()));
-        //        }
-        //        if (ListUtil.isNotEmpty(inputInfo.getDutyShiftSystemDocs())) {
-        //            inputInfo.getPageData().put("值班交接制度", inputInfo.getDutyShiftSystemDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        //        }
+        if (ListUtil.isNotEmpty(inputInfo.getDutyShiftSystemDocs())) {
+            inputInfo.getPageData().put("值班交接制度", inputInfo.getDutyShiftSystemDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
+        }
         if (ListUtil.isNotEmpty(inputInfo.getRescueDocs())) {
             inputInfo.getPageData().put("抢救记录", inputInfo.getRescueDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
         }
-        //        if (ListUtil.isNotEmpty(inputInfo.getSeriouslyIllNoticeDocs())) {
-        //            inputInfo.getPageData().put("病重通知书", inputInfo.getSeriouslyIllNoticeDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        //        }
         if (ListUtil.isNotEmpty(inputInfo.getStagesSummaryDocs())) {
             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()));
-        }
-        if (ListUtil.isNotEmpty(inputInfo.getDailyCourseRecordDocs())) {
-            inputInfo.getPageData().put("日常病程录", inputInfo.getDailyCourseRecordDocs().stream().map(i -> i.getPageData()).collect(Collectors.toList()));
-        }
-
         if (ListUtil.isNotEmpty(inputInfo.getConsultationDocs())) {
             List<Map<String, Object>> crPd = inputInfo.getConsultationDocs()
                     .stream()
@@ -249,7 +209,6 @@ public class BeilunDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
-                    //                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "手术日期", "yyyy/MM/dd"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(odPageDataList)) {
                 inputInfo.getPageData().put("术后首次病程及谈话记录", odPageDataList);
@@ -259,7 +218,6 @@ public class BeilunDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
                     .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
-                    //                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "开始时间", "yyyy/MM/dd HH:mm"))
                     .collect(Collectors.toList());
             if (ListUtil.isNotEmpty(orPageDataList)) {
                 inputInfo.getPageData().put("手术记录", orPageDataList);
@@ -269,29 +227,10 @@ public class BeilunDocTrans extends DocTrans {
                     .stream()
                     .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
                     .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
-                    //                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "讨论时间", "yyyy年MM月dd日 HH时mm分"))
                     .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())
-                    .sorted((map1, map2) -> pageDataTimeSort(map1, map2, "谈话日期", "yyyy/MM/dd HH:mm"))
-                    .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);
-            }*/
         }
         if (inputInfo.getTransferRecordDocs() != null) {
             if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferIntoDocs())) {
@@ -304,6 +243,7 @@ public class BeilunDocTrans extends DocTrans {
                                 .collect(Collectors.toList())
                 );
             }
+
             if (ListUtil.isNotEmpty(inputInfo.getTransferRecordDocs().getTransferOutDocs())) {
                 inputInfo.getPageData().put(
                         "转出记录",