模板映射更新

dbanaly/pom.xml

@@ -58,5 +58,20 @@
             <version>3.0.13.RELEASE</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.1.4.RELEASE</version>
+        </dependency>
     </dependencies>
 </project>

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/ModuleHelper.java

@@ -3,6 +3,7 @@ package com.lantone.qc.dbanaly.facade.comsis;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.lantone.qc.dbanaly.lt.entity.ModuleInfo;
 import com.lantone.qc.dbanaly.lt.entity.ModuleMapping;
 import com.lantone.qc.dbanaly.lt.entity.RecordAnalyzeDetail;
@@ -71,9 +72,16 @@ public class ModuleHelper {
         QueryWrapper<ModuleInfo> moduleInfoQe = new QueryWrapper<>();
         moduleInfoQe.eq("is_deleted", "N");
         moduleInfoQe.eq("hospital_id", Long.parseLong(hospitalId));
-        moduleInfoQe.ne("mode_id", 6l);
         moduleInfoQe.select("id");
-        List<Long> moduleInfoIds = moduleInfoService.list(moduleInfoQe).stream().map(i -> i.getId()).collect(Collectors.toList());
+        List<ModuleInfo> moduleInfoList = moduleInfoService.list(moduleInfoQe);
+        if (ListUtil.isEmpty(moduleInfoList)) {
+            return;
+        }
+        List<Long> moduleInfoIds = moduleInfoList.stream().filter(i -> i.getModeId().intValue() == 6).map(i -> i.getId()).collect(Collectors.toList());
+        if (moduleInfoIds.size() == 1) {
+            result.put(Sets.newHashSet("mode_id=6"), moduleInfoIds.get(0) + "");
+        }
+        moduleInfoIds = moduleInfoList.stream().filter(i -> i.getModeId().intValue() != 6).map(i -> i.getId()).collect(Collectors.toList());
         if (ListUtil.isEmpty(moduleInfoIds)) {
             return;
         }

dbanaly/src/main/resources/application-db.yml

@@ -6,17 +6,17 @@ spring:
       lantone:
         driver-class-name: com.mysql.jdbc.Driver
         ##236数据库 内网
-        #        url: jdbc:mysql://192.168.2.236:3306/qc?useUnicode=true&characterEncoding=utf8
-        #        username: root
-        #        password: lantone
+        url: jdbc:mysql://192.168.2.236:3306/qc?useUnicode=true&characterEncoding=utf8
+        username: root
+        password: lantone
         ##236数据库 外网
         #        url: jdbc:mysql://223.93.170.82:23606/qc?useUnicode=true&characterEncoding=utf8
         #        username: root
         #        password: lantone
         ##121数据库 内网
-        url: jdbc:mysql://192.168.2.121:3306/qc?useUnicode=true&characterEncoding=utf8
-        username: root
-        password: QuGDHNG35r
+#        url: jdbc:mysql://192.168.2.121:3306/qc?useUnicode=true&characterEncoding=utf8
+#        username: root
+#        password: QuGDHNG35r
         ##121数据库 外网
         #        url: jdbc:mysql://223.93.170.82:23606/qc?useUnicode=true&characterEncoding=utf8
         #        username: root

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -21,7 +21,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
 
     @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
         String sex = "男";
         for (String key : sourceMap.keySet()) {
@@ -32,7 +33,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             }
         }
         sourceMap.put(sex, "");
-        sourceMap.put("mode_id=1", "");
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         String specialCheck = structureMap.get("专科检查");
         if (StringUtil.isNotBlank(specialCheck)) {
@@ -45,8 +47,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
         }
         String marital = structureMap.get("婚育史");
         String marry = structureMap.get("婚姻");
-        if (StringUtil.isBlank(marital) && StringUtil.isNotBlank(marry)){
-            structureMap.put("婚育史",marry);
+        if (StringUtil.isBlank(marital) && StringUtil.isNotBlank(marry)) {
+            structureMap.put("婚育史", marry);
         }
         BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);
         beHospitalizedDoc.setText(content);

trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicBloodEffectDocTrans.java

@@ -24,15 +24,17 @@ public class ChangxClinicBloodEffectDocTrans extends ModelDocTrans {
     @Override
     public List<ClinicBloodEffectDoc> extract(MedrecVo medrecVo) {
         List<ClinicBloodEffectDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getClinicalBloodDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getClinicalBloodDoc(contentMap));
         });
         return retList;
     }
-    private ClinicBloodEffectDoc getClinicalBloodDoc(String content) {
+    private ClinicBloodEffectDoc getClinicalBloodDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=32", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicalBloodDocTrans.java

@@ -23,16 +23,18 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
     @Override
     public List<ClinicalBloodDoc> extract(MedrecVo medrecVo) {
         List<ClinicalBloodDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getClinicalBloodDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getClinicalBloodDoc(contentMap));
         });
         return retList;
     }
 
-    private ClinicalBloodDoc getClinicalBloodDoc(String content) {
+    private ClinicalBloodDoc getClinicalBloodDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=10", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

@@ -37,9 +37,9 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             return retList;
         }
 
-        Map<String, ConsultationRecordDoc> consultationRecordDocMap = getConsultationRecordDocMap(contentMap.get("会诊记录"));
-        Map<String, ConsultationResultsDoc> consultationResultsDocMap = getConsultationResultsDocMap(contentMap.get("会诊结果单"));
-        Map<String, ConsultationApplicationDoc> consultationApplicationDocMap = getConsultationApplicationDocMap(contentMap.get("会诊申请单"));
+        Map<String, ConsultationRecordDoc> consultationRecordDocMap = getConsultationRecordDocMap((List) contentMap.get("会诊记录"));
+        Map<String, ConsultationResultsDoc> consultationResultsDocMap = getConsultationResultsDocMap((List) contentMap.get("会诊结果单"));
+        Map<String, ConsultationApplicationDoc> consultationApplicationDocMap = getConsultationApplicationDocMap((List) contentMap.get("会诊申请单"));
 
         Set<String> consultationNameSet = Sets.newHashSet();
         consultationNameSet.addAll(consultationRecordDocMap.keySet());
@@ -60,19 +60,19 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊记录*********************************************************/
-    private Map<String, ConsultationRecordDoc> getConsultationRecordDocMap(List<String> contents) {
+    private Map<String, ConsultationRecordDoc> getConsultationRecordDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationRecordDoc consultationRecordDoc = getConsultationRecordDoc(content);
+            ConsultationRecordDoc consultationRecordDoc = getConsultationRecordDoc(contentMap);
             consultationRecordDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationRecordDoc);
             index++;
@@ -80,9 +80,11 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationRecordDoc getConsultationRecordDoc(String content) {
+    private ConsultationRecordDoc getConsultationRecordDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=7", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationRecord_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -113,19 +115,19 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊结果单*******************************************************/
-    private Map<String, ConsultationResultsDoc> getConsultationResultsDocMap(List<String> contents) {
+    private Map<String, ConsultationResultsDoc> getConsultationResultsDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationResultsDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationResultsDoc consultationResultsDoc = getConsultationResultsDoc(content);
+            ConsultationResultsDoc consultationResultsDoc = getConsultationResultsDoc(contentMap);
             consultationResultsDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationResultsDoc);
             index++;
@@ -133,9 +135,11 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationResultsDoc getConsultationResultsDoc(String content) {
+    private ConsultationResultsDoc getConsultationResultsDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=31", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -167,19 +171,19 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊申请单*******************************************************/
-    private Map<String, ConsultationApplicationDoc> getConsultationApplicationDocMap(List<String> contents) {
+    private Map<String, ConsultationApplicationDoc> getConsultationApplicationDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationApplicationDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationApplicationDoc consultationApplicationDoc = getConsultationApplicationDoc(content);
+            ConsultationApplicationDoc consultationApplicationDoc = getConsultationApplicationDoc(contentMap);
             consultationApplicationDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationApplicationDoc);
             index++;
@@ -187,9 +191,11 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
+    private ConsultationApplicationDoc getConsultationApplicationDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=30", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxCrisisValueReportDocTrans.java

@@ -23,15 +23,18 @@ public class ChangxCrisisValueReportDocTrans extends ModelDocTrans {
     @Override
     public List<CrisisValueReportDoc> extract(MedrecVo medrecVo) {
         List<CrisisValueReportDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getCrisisValueReportDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getCrisisValueReportDoc(contentMap));
         });
         return retList;
     }
 
-    private CrisisValueReportDoc getCrisisValueReportDoc(String content) {
+    private CrisisValueReportDoc getCrisisValueReportDoc(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);
         structureMap.put("医生姓名", structureMap.get("医生签名"));
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxCriticallyIllNoticeDocTrans.java

@@ -23,16 +23,18 @@ public class ChangxCriticallyIllNoticeDocTrans extends ModelDocTrans {
     @Override
     public List<CriticallyIllNoticeDoc> extract(MedrecVo medrecVo) {
         List<CriticallyIllNoticeDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getCriticallyIllNoticeDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getCriticallyIllNoticeDoc(contentMap));
         });
         return retList;
     }
 
-    private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(String content) {
+    private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=25", "");
+        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.getTextByNodePath(content, "//DocObjContent/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathCaseDiscussDocTrans.java

@@ -22,9 +22,11 @@ public class ChangxDeathCaseDiscussDocTrans extends ModelDocTrans {
 
     @Override
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=3", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathRecordDocTrans.java

@@ -22,10 +22,12 @@ public class ChangxDeathRecordDocTrans extends ModelDocTrans {
 
     @Override
     public DeathRecordDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
 
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=24", "");
+        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.getTextByNodePath(content, "//DocObjContent/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxDifficultCaseDiscussDocTrans.java

@@ -23,16 +23,18 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
     @Override
     public List<DifficultCaseDiscussDoc> extract(MedrecVo medrecVo) {
         List<DifficultCaseDiscussDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getDifficultCaseDiscussDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getDifficultCaseDiscussDoc(contentMap));
         });
         return retList;
     }
 
-    private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
+    private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=19", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstCourseRecordDocTrans.java

@@ -23,9 +23,11 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
 
     @Override
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=2", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstPageRecordDocTrans.java

@@ -1,11 +1,13 @@
 package com.lantone.qc.trans.changx;
 
 import com.google.common.collect.Maps;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 
 import java.util.HashMap;
@@ -49,7 +51,13 @@ public class ChangxFirstPageRecordDocTrans extends ModelDocTrans {
             }
             medrecVo.getContent().put("出院诊断", list.toString());
         }
-        medrecVo.getContent().put("mode_id", "210");
+
+        Map<String, String> setMap = Maps.newHashMap();
+        setMap.put("mode_id=6", "");
+        String modeId = ModuleMappingUtil.getXmlDataTypeModuleId(setMap);
+        if (StringUtil.isNotBlank(modeId)) {
+            medrecVo.getContent().put("mode_id", modeId);
+        }
         firstPageRecordDoc.setPageData(medrecVo.getContent());
         return firstPageRecordDoc;
     }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxLeaveHospitalDocTrans.java

@@ -20,9 +20,11 @@ public class ChangxLeaveHospitalDocTrans extends ModelDocTrans {
 
     @Override
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        sourceMap.put("mode_id=5", "");
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
         leaveHospitalDoc.setText(content);
@@ -46,7 +48,7 @@ public class ChangxLeaveHospitalDocTrans extends ModelDocTrans {
             "诊治经过++++入院诊治经过=诊治经过",
             "出院情况=",
             "出院医嘱=",
- /*           "健康教育=注意事项",*/
+            /*           "健康教育=注意事项",*/
             "随访计划=",
             "签名++++=医师签名",
             "签名时间=签名时间",

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -38,11 +38,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             return retList;
         }
 
-        Map<String, OperationDiscussionDoc> operationDiscussionDocMap = getOperationDiscussionDocMap(contentMap.get("术后首次病程及谈话记录"));
-        Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap(contentMap.get("手术记录"));
-        Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap(contentMap.get("术前讨论、术前小结"));
-        Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap(contentMap.get("手术知情同意书"));
-        Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap(contentMap.get("手术安全核查表"));
+        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());
@@ -67,19 +67,19 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     /*******************************************术后首次病程及谈话记录***************************************************/
-    private Map<String, OperationDiscussionDoc> getOperationDiscussionDocMap(List<String> contents) {
+    private Map<String, OperationDiscussionDoc> getOperationDiscussionDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationDiscussionDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationDiscussionDoc operationDiscussionDoc = getOperationDiscussionDoc(content);
+            OperationDiscussionDoc operationDiscussionDoc = getOperationDiscussionDoc(contentMap);
             operationDiscussionDoc.setOperationName(operationName);
             retMap.put(operationName, operationDiscussionDoc);
             index++;
@@ -87,9 +87,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
+    private OperationDiscussionDoc getOperationDiscussionDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=18", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationDiscussion_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("手术开始时间"))) {
             structureMap.put("手术时间", structureMap.get("手术开始时间"));
@@ -151,19 +153,19 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************手术记录*************************************************************/
-    private Map<String, OperationRecordDoc> getOperationRecordDocMap(List<String> contents) {
+    private Map<String, OperationRecordDoc> getOperationRecordDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationRecordDoc operationRecordDoc = getOperationRecordDoc(content);
+            OperationRecordDoc operationRecordDoc = getOperationRecordDoc(contentMap);
             operationRecordDoc.setOperationName(operationName);
             retMap.put(operationName, operationRecordDoc);
             index++;
@@ -171,9 +173,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationRecordDoc getOperationRecordDoc(String content) {
+    private OperationRecordDoc getOperationRecordDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=17", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationRecord_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("签名"))) {
             structureMap.put("记录医师", structureMap.get("签名"));
@@ -228,8 +232,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "++++深层组织手术=",
             "++++器官手术=",
             "++++空隙手术=",
-//            "++++术中送检无=术中送检",
-//            "++++术中送检有=术中送检",
+            //            "++++术中送检无=术中送检",
+            //            "++++术中送检有=术中送检",
             "冰冻切片结果=",
             "++++并发症无=手术并发症",
             "++++并发症有=手术并发症",
@@ -243,19 +247,19 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************术前讨论、术前小结****************************************************/
-    private Map<String, PreoperativeDiscussionDoc> getPreoperativeDiscussionDocMap(List<String> contents) {
+    private Map<String, PreoperativeDiscussionDoc> getPreoperativeDiscussionDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, PreoperativeDiscussionDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            PreoperativeDiscussionDoc preoperativeDiscussionDoc = getPreoperativeDiscussionDoc(content);
+            PreoperativeDiscussionDoc preoperativeDiscussionDoc = getPreoperativeDiscussionDoc(contentMap);
             preoperativeDiscussionDoc.setOperationName(operationName);
             retMap.put(operationName, preoperativeDiscussionDoc);
             index++;
@@ -263,9 +267,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
+    private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=11", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, preoperativeDiscussion_keyContrasts);
         structureMap.put(
                 "术前准备内容",
@@ -339,19 +345,19 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************手术知情同意书****************************************************/
-    private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<String> contents) {
+    private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationInformedConsentDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationInformedConsentDoc operationInformedConsentDoc = getOperationInformedConsentDoc(content);
+            OperationInformedConsentDoc operationInformedConsentDoc = getOperationInformedConsentDoc(contentMap);
             operationInformedConsentDoc.setOperationName(operationName);
             retMap.put(operationName, operationInformedConsentDoc);
             index++;
@@ -359,9 +365,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationInformedConsentDoc getOperationInformedConsentDoc(String content) {
+    private OperationInformedConsentDoc getOperationInformedConsentDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=16", "");
+        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.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -414,19 +422,19 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************手术安全核查表****************************************************/
-    private Map<String, OperationSafetyChecklistDoc> getOperationSafetyChecklistDocMap(List<String> contents) {
+    private Map<String, OperationSafetyChecklistDoc> getOperationSafetyChecklistDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationSafetyChecklistDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationSafetyChecklistDoc operationSafetyChecklistDoc = getOperationSafetyChecklistDoc(content);
+            OperationSafetyChecklistDoc operationSafetyChecklistDoc = getOperationSafetyChecklistDoc(contentMap);
             operationSafetyChecklistDoc.setOperationName(operationName);
             retMap.put(operationName, operationSafetyChecklistDoc);
             index++;
@@ -434,9 +442,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
+    private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=21", "");
+        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.getTextByNodePath(content, "//DocObjContent/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxPathologyShipDocTrans.java

@@ -20,16 +20,18 @@ public class ChangxPathologyShipDocTrans extends ModelDocTrans {
     @Override
     public List<PathologyShipDoc> extract(MedrecVo medrecVo) {
         List<PathologyShipDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getPathologyShipDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getPathologyShipDoc(contentMap));
         });
         return retList;
     }
 
-    private PathologyShipDoc getPathologyShipDoc(String content) {
+    private PathologyShipDoc getPathologyShipDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        sourceMap.put("mode_id=35", "");
+        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();

trans/src/main/java/com/lantone/qc/trans/changx/ChangxRescueDocTrans.java

@@ -23,16 +23,18 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
     @Override
     public List<RescueDoc> extract(MedrecVo medrecVo) {
         List<RescueDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getRescueDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getRescueDoc(contentMap));
         });
         return retList;
     }
 
-    private RescueDoc getRescueDoc(String content) {
+    private RescueDoc getRescueDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=22", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxStagesSummaryDocTrans.java

@@ -23,16 +23,18 @@ public class ChangxStagesSummaryDocTrans extends ModelDocTrans {
     @Override
     public List<StagesSummaryDoc> extract(MedrecVo medrecVo) {
         List<StagesSummaryDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getStagesSummaryDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getStagesSummaryDoc(contentMap));
         });
         return retList;
     }
 
-    private StagesSummaryDoc getStagesSummaryDoc(String content) {
+    private StagesSummaryDoc getStagesSummaryDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=28", "");
+        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.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -29,18 +29,20 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
     @Override
     public List<ThreeLevelWardDoc> extract(MedrecVo medrecVo) {
         List<ThreeLevelWardDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
         ThreeLevelWardDoc threeLevelWardDoc = new ThreeLevelWardDoc();
-        contents.forEach(content -> {
-            classifyThreeLevelWardDoc(threeLevelWardDoc, content);
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            classifyThreeLevelWardDoc(threeLevelWardDoc, contentMap);
         });
         retList.add(threeLevelWardDoc);
         return retList;
     }
 
-    private void classifyThreeLevelWardDoc(ThreeLevelWardDoc threeLevelWardDoc, String content) {
+    private void classifyThreeLevelWardDoc(ThreeLevelWardDoc threeLevelWardDoc, Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=4", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         structureMap.put("查房日期", structureMap.get("记录时间"));
 
@@ -59,7 +61,7 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
                         structureMap.put("记录医师", cutWordMap.get("医师签名"));
                     }
                 }
-                if(StringUtil.isNotEmpty(cutWordMap.get("记录医生"))){
+                if (StringUtil.isNotEmpty(cutWordMap.get("记录医生"))) {
                     Matcher m = p.matcher(cutWordMap.get("记录医生"));
                     if (!m.matches()) {
                         structureMap.put("记录医师", cutWordMap.get("记录医生"));

trans/src/main/java/com/lantone/qc/trans/changx/ChangxTransferRecordDocTrans.java

@@ -35,17 +35,17 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
         if (contentMap == null) {
             return transferRecordDoc;
         }
-        List<String> into = contentMap.get("转入记录");
-        List<String> out = contentMap.get("转出记录");
-        List<String> all = new ArrayList<>();
+        List<Map<String, Object>> into = (List) contentMap.get("转入记录");
+        List<Map<String, Object>> out = (List) contentMap.get("转出记录");
+        List<Map<String, Object>> all = new ArrayList<>();
 
         Map<String, TransferIntoDoc> transferIntoDocMap = new HashMap<>();
         Map<String, TransferOutDoc> transferOutDocMap = new HashMap<>();
-        if (into != null){
+        if (into != null) {
             all.addAll(into);
             transferIntoDocMap = getTransferIntoDocMap(into);
         }
-        if (out != null){
+        if (out != null) {
             all.addAll(out);
             transferOutDocMap = getTransferOutDocMap(out);
         }
@@ -121,19 +121,19 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
 
 
     /**************************************************转入*******************************************************/
-    private Map<String, TransferIntoDoc> getTransferIntoDocMap(List<String> contents) {
+    private Map<String, TransferIntoDoc> getTransferIntoDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferIntoDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferIntoDoc transferIntoDoc = getTransferIntoDoc(content);
+            TransferIntoDoc transferIntoDoc = getTransferIntoDoc(contentMap);
             transferIntoDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferIntoDoc);
             index++;
@@ -141,9 +141,11 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferIntoDoc getTransferIntoDoc(String content) {
+    private TransferIntoDoc getTransferIntoDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=26", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         //        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
@@ -156,19 +158,19 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
     }
 
     /**************************************************全部*******************************************************/
-    private Map<String, TransferRecordDoc> getTransferAllDocMap(List<String> contents) {
+    private Map<String, TransferRecordDoc> getTransferAllDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferRecordDoc transferRecordDoc = getTransferAllDoc(content);
+            TransferRecordDoc transferRecordDoc = getTransferAllDoc(contentMap);
             transferRecordDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferRecordDoc);
             index++;
@@ -176,7 +178,8 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferRecordDoc getTransferAllDoc(String content) {
+    private TransferRecordDoc getTransferAllDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
@@ -188,19 +191,19 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
 
 
     /**************************************************转出*******************************************************/
-    private Map<String, TransferOutDoc> getTransferOutDocMap(List<String> contents) {
+    private Map<String, TransferOutDoc> getTransferOutDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferOutDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferOutDoc transferOutDoc = getTransferOutDoc(content);
+            TransferOutDoc transferOutDoc = getTransferOutDoc(contentMap);
             transferOutDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferOutDoc);
             index++;
@@ -208,9 +211,11 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferOutDoc getTransferOutDoc(String content) {
+    private TransferOutDoc getTransferOutDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
-        xmlNodeValueMap.put("mode_id=27", "");
+        xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();

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

@@ -20,15 +20,19 @@ public class TaiZhouAnesthesiaRelatedDocTrans extends ModelDocTrans {
     @Override
     public List<AnesthesiaRelatedDoc> extract(MedrecVo medrecVo) {
         List<AnesthesiaRelatedDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getAnesthesiaRelatedDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getAnesthesiaRelatedDoc(contentMap));
         });
         return retList;
     }
 
-    private AnesthesiaRelatedDoc getAnesthesiaRelatedDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+    private AnesthesiaRelatedDoc getAnesthesiaRelatedDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
+        Map<String, String> xmlNodeValueMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         AnesthesiaRelatedDoc anesthesiaRelatedDoc = new AnesthesiaRelatedDoc();
         anesthesiaRelatedDoc.setStructureMap(structureMap);

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

@@ -35,9 +35,12 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
      */
     @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
 
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
         //如果有入院时间，优先使用
         if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {

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

@@ -21,15 +21,18 @@ public class TaiZhouClinicBloodEffectDocTrans extends ModelDocTrans {
     @Override
     public List<ClinicBloodEffectDoc> extract(MedrecVo medrecVo) {
         List<ClinicBloodEffectDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getClinicBloodEffectDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getClinicBloodEffectDoc(contentMap));
         });
         return retList;
     }
 
-    private ClinicBloodEffectDoc getClinicBloodEffectDoc(String content) {
+    private ClinicBloodEffectDoc getClinicBloodEffectDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         ClinicBloodEffectDoc clinicBloodEffectDoc = new ClinicBloodEffectDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouClinicalBloodDocTrans extends ModelDocTrans {
     @Override
     public List<ClinicalBloodDoc> extract(MedrecVo medrecVo) {
         List<ClinicalBloodDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getClinicalBloodDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getClinicalBloodDoc(contentMap));
         });
         return retList;
     }
 
-    private ClinicalBloodDoc getClinicalBloodDoc(String content) {
+    private ClinicalBloodDoc getClinicalBloodDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         ClinicalBloodDoc clinicalBloodDoc = new ClinicalBloodDoc();

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

@@ -41,9 +41,9 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
             return retList;
         }
 
-        Map<String, ConsultationRecordDoc> consultationRecordDocMap = getConsultationRecordDocMap(contentMap.get("会诊记录"));
-        Map<String, ConsultationResultsDoc> consultationResultsDocMap = getConsultationResultsDocMap(contentMap.get("会诊结果单"));
-        Map<String, ConsultationApplicationDoc> consultationApplicationDocMap = getConsultationApplicationDocMap(contentMap.get("会诊申请单"));
+        Map<String, ConsultationRecordDoc> consultationRecordDocMap = getConsultationRecordDocMap((List) contentMap.get("会诊记录"));
+        Map<String, ConsultationResultsDoc> consultationResultsDocMap = getConsultationResultsDocMap((List) contentMap.get("会诊结果单"));
+        Map<String, ConsultationApplicationDoc> consultationApplicationDocMap = getConsultationApplicationDocMap((List) contentMap.get("会诊申请单"));
 
         Set<String> consultationNameSet = Sets.newHashSet();
         consultationNameSet.addAll(consultationRecordDocMap.keySet());
@@ -64,19 +64,19 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊记录*********************************************************/
-    private Map<String, ConsultationRecordDoc> getConsultationRecordDocMap(List<String> contents) {
+    private Map<String, ConsultationRecordDoc> getConsultationRecordDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationRecordDoc consultationRecordDoc = getConsultationRecordDoc(content);
+            ConsultationRecordDoc consultationRecordDoc = getConsultationRecordDoc(contentMap);
             consultationRecordDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationRecordDoc);
             index++;
@@ -84,8 +84,11 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationRecordDoc getConsultationRecordDoc(String content) {
+    private ConsultationRecordDoc getConsultationRecordDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
 
         ConsultationRecordDoc consultationRecordDoc = new ConsultationRecordDoc();
@@ -103,19 +106,19 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊结果单*******************************************************/
-    private Map<String, ConsultationResultsDoc> getConsultationResultsDocMap(List<String> contents) {
+    private Map<String, ConsultationResultsDoc> getConsultationResultsDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationResultsDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationResultsDoc consultationResultsDoc = getConsultationResultsDoc(content);
+            ConsultationResultsDoc consultationResultsDoc = getConsultationResultsDoc(contentMap);
             consultationResultsDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationResultsDoc);
             index++;
@@ -123,8 +126,11 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationResultsDoc getConsultationResultsDoc(String content) {
+    private ConsultationResultsDoc getConsultationResultsDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_keyContrasts);
 
         ConsultationResultsDoc consultationResultsDoc = new ConsultationResultsDoc();
@@ -146,19 +152,19 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
 
 
     /**************************************************会诊申请单*******************************************************/
-    private Map<String, ConsultationApplicationDoc> getConsultationApplicationDocMap(List<String> contents) {
+    private Map<String, ConsultationApplicationDoc> getConsultationApplicationDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, ConsultationApplicationDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String consultationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             consultationName = index + "";
-            ConsultationApplicationDoc consultationApplicationDoc = getConsultationApplicationDoc(content);
+            ConsultationApplicationDoc consultationApplicationDoc = getConsultationApplicationDoc(contentMap);
             consultationApplicationDoc.setConsultationName(consultationName);
             retMap.put(consultationName, consultationApplicationDoc);
             index++;
@@ -166,8 +172,11 @@ public class TaiZhouConsultationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
+    private ConsultationApplicationDoc getConsultationApplicationDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
 
         ConsultationApplicationDoc consultationApplicationDoc = new ConsultationApplicationDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouCrisisValueReportDocTrans extends ModelDocTrans {
     @Override
     public List<CrisisValueReportDoc> extract(MedrecVo medrecVo) {
         List<CrisisValueReportDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getCrisisValueReportDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getCrisisValueReportDoc(contentMap));
         });
         return retList;
     }
 
-    private CrisisValueReportDoc getCrisisValueReportDoc(String content) {
+    private CrisisValueReportDoc getCrisisValueReportDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         CrisisValueReportDoc crisisValueReportDoc = new CrisisValueReportDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouCriticallyIllNoticeDocTrans extends ModelDocTrans {
     @Override
     public List<CriticallyIllNoticeDoc> extract(MedrecVo medrecVo) {
         List<CriticallyIllNoticeDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getCriticallyIllNoticeDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getCriticallyIllNoticeDoc(contentMap));
         });
         return retList;
     }
 
-    private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(String content) {
+    private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         CriticallyIllNoticeDoc criticallyIllNoticeDoc = new CriticallyIllNoticeDoc();

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

@@ -19,8 +19,11 @@ public class TaiZhouDeathCaseDiscussDocTrans extends ModelDocTrans {
 
     @Override
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = new DeathCaseDiscussDoc();

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

@@ -19,8 +19,11 @@ public class TaiZhouDeathRecordDocTrans extends ModelDocTrans {
 
     @Override
     public DeathRecordDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         DeathRecordDoc deathRecordDoc = new DeathRecordDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
     @Override
     public List<DifficultCaseDiscussDoc> extract(MedrecVo medrecVo) {
         List<DifficultCaseDiscussDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getDifficultCaseDiscussDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getDifficultCaseDiscussDoc(contentMap));
         });
         return retList;
     }
 
-    private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
+    private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = new DifficultCaseDiscussDoc();

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

@@ -20,20 +20,23 @@ public class TaiZhouDutyShiftSystemDocTrans extends ModelDocTrans {
     @Override
     public List<DutyShiftSystemDoc> extract(MedrecVo medrecVo) {
         List<DutyShiftSystemDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getDutyShiftSystemDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getDutyShiftSystemDoc(contentMap));
         });
         return retList;
     }
 
-    private DutyShiftSystemDoc getDutyShiftSystemDoc(String content) {
+    private DutyShiftSystemDoc getDutyShiftSystemDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DutyShiftSystemDoc dutyShiftSystemDoc = new DutyShiftSystemDoc();
         dutyShiftSystemDoc.setStructureMap(structureMap);
-        dutyShiftSystemDoc.setPageData((Map)sourceMap);
+        dutyShiftSystemDoc.setPageData((Map) sourceMap);
         return dutyShiftSystemDoc;
     }
 

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

@@ -22,9 +22,12 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
 
     @Override
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
 
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
         // 病例特点=主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
         //        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(

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

@@ -2,10 +2,12 @@ package com.lantone.qc.trans.taizhou;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
+import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +43,13 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
         structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
         //        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));
         firstPageRecordDoc.setStructureExtMap(structureExtMap);
+
+        Map<String, String> setMap = Maps.newHashMap();
+        setMap.put("mode_id=6", "");
+        String modeId = ModuleMappingUtil.getXmlDataTypeModuleId(setMap);
+        if (StringUtil.isNotBlank(modeId)) {
+            medrecVo.getContent().put("mode_id", modeId);
+        }
         firstPageRecordDoc.setPageData(medrecVo.getContent());
 
         return firstPageRecordDoc;
@@ -122,9 +131,9 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "血型=",
             "并发症=",
             "临床路径管理=",
-//            "临床路径管理 1.完成 2.变异 3.退出 4.未入=临床路径管理",
-//            "有无药物过敏=药物过敏",
-//            "单病种管理 1.是 2.否=单病种管理",
+            //            "临床路径管理 1.完成 2.变异 3.退出 4.未入=临床路径管理",
+            //            "有无药物过敏=药物过敏",
+            //            "单病种管理 1.是 2.否=单病种管理",
             "现住址电话=现住址电话",
             "拟接收医疗机构名称=",
             "科主任=",
@@ -151,11 +160,11 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "其它过敏=",
             "审核人=",
             "病理诊断=",
-//            "放射与病理符合=放射与病理",
+            //            "放射与病理符合=放射与病理",
             "医院=",
             "就诊类别=",
             "籍贯=",
-//            "门诊与出院符合=门诊与出院",
+            //            "门诊与出院符合=门诊与出院",
             "麻醉医师=",
             "实习医生=",
             "HIV-Ab=",
@@ -179,7 +188,7 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "HBsAg=",
             "手术记录=",
             "单病种管理=",
-//            "临床与病理符合=临床与病理",
+            //            "临床与病理符合=临床与病理",
             "麻醉费=",
             "康复费=",
             "研究生=",
@@ -190,7 +199,7 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "医疗付费方式=",
             "其它诊断=",
             "是否进入临床路径=",
-//            "入院与出院符合=入院与出院",
+            //            "入院与出院符合=入院与出院",
             "诊断治疗信息=",
             "抢救次数=",
             "入院诊断=",
@@ -238,12 +247,12 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "本人工作单位电话=",
             "工作单位邮政编码=",
             "病理号="
-//            "病人出生日期=出生日期"
-//            "门诊与出院符合 0.未做 1.符合 2.不符合 3.不确定=门诊与出院",
-//            "入院与出院符合 0.未做 1.符合 2.不符合 3.不确定=入院与出院",
-//            "术前与术后符合 0.未做 1.符合 2.不符合 3.不确定=术前与术后",
-//            "临床与病理符合 0.未做 1.符合 2.不符合 3.不确定=临床与病理",
-//            "放射与病理符合0.未做 1.符合 2.不符合 3.不确定=放射与病理"
+            //            "病人出生日期=出生日期"
+            //            "门诊与出院符合 0.未做 1.符合 2.不符合 3.不确定=门诊与出院",
+            //            "入院与出院符合 0.未做 1.符合 2.不符合 3.不确定=入院与出院",
+            //            "术前与术后符合 0.未做 1.符合 2.不符合 3.不确定=术前与术后",
+            //            "临床与病理符合 0.未做 1.符合 2.不符合 3.不确定=临床与病理",
+            //            "放射与病理符合0.未做 1.符合 2.不符合 3.不确定=放射与病理"
     );
 
 }

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

@@ -20,15 +20,19 @@ public class TaiZhouInvasiveOperationDocTrans extends ModelDocTrans {
     @Override
     public List<InvasiveOperationDoc> extract(MedrecVo medrecVo) {
         List<InvasiveOperationDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getInvasiveOperationDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getInvasiveOperationDoc(contentMap));
         });
         return retList;
     }
 
-    private InvasiveOperationDoc getInvasiveOperationDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+    private InvasiveOperationDoc getInvasiveOperationDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
+        Map<String, String> xmlNodeValueMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         InvasiveOperationDoc invasiveOperationDoc = new InvasiveOperationDoc();
         invasiveOperationDoc.setStructureMap(structureMap);

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

@@ -19,9 +19,12 @@ public class TaiZhouLeaveHospitalDocTrans extends ModelDocTrans {
 
     @Override
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
 
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);

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

@@ -20,15 +20,19 @@ public class TaiZhouMedicalWritingDocTrans extends ModelDocTrans {
     @Override
     public List<MedicalWritingDoc> extract(MedrecVo medrecVo) {
         List<MedicalWritingDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getMedicalWritingDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getMedicalWritingDoc(contentMap));
         });
         return retList;
     }
 
-    private MedicalWritingDoc getMedicalWritingDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+    private MedicalWritingDoc getMedicalWritingDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
+        Map<String, String> xmlNodeValueMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         MedicalWritingDoc medicalWritingDoc = new MedicalWritingDoc();
         medicalWritingDoc.setStructureMap(structureMap);

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

@@ -19,9 +19,13 @@ public class TaiZhouNursingSystemDocTrans extends ModelDocTrans {
 
     @Override
     public NursingSystemDoc extract(MedrecVo medrecVo) {
-        String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
+        Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
+        String content = contentMap.get("xmlText").toString();
 
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         NursingSystemDoc nursingSystemDoc = new NursingSystemDoc();
         nursingSystemDoc.setStructureMap(structureMap);

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

@@ -42,11 +42,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
             return retList;
         }
 
-        Map<String, OperationDiscussionDoc> operationDiscussionDocMap = getOperationDiscussionDocMap(contentMap.get("术后首次病程及谈话记录"));
-        Map<String, OperationRecordDoc> operationRecordDocMap = getOperationRecordDocMap(contentMap.get("手术记录"));
-        Map<String, PreoperativeDiscussionDoc> preoperativeDiscussionDocMap = getPreoperativeDiscussionDocMap(contentMap.get("术前讨论、术前小结"));
-        Map<String, OperationInformedConsentDoc> operationInformedConsentDocMap = getOperationInformedConsentDocMap(contentMap.get("手术知情同意书"));
-        Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap(contentMap.get("手术安全核查表"));
+        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());
@@ -70,19 +70,19 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
 
     /*******************************************术后首次病程及谈话记录***************************************************/
-    private Map<String, OperationDiscussionDoc> getOperationDiscussionDocMap(List<String> contents) {
+    private Map<String, OperationDiscussionDoc> getOperationDiscussionDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationDiscussionDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationDiscussionDoc operationDiscussionDoc = getOperationDiscussionDoc(content);
+            OperationDiscussionDoc operationDiscussionDoc = getOperationDiscussionDoc(contentMap);
             operationDiscussionDoc.setOperationName(operationName);
             retMap.put(operationName, operationDiscussionDoc);
             index++;
@@ -90,8 +90,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
+    private OperationDiscussionDoc getOperationDiscussionDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
 
         OperationDiscussionDoc operationDiscussionDoc = new OperationDiscussionDoc();
@@ -109,19 +112,19 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************手术记录*************************************************************/
-    private Map<String, OperationRecordDoc> getOperationRecordDocMap(List<String> contents) {
+    private Map<String, OperationRecordDoc> getOperationRecordDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationRecordDoc operationRecordDoc = getOperationRecordDoc(content);
+            OperationRecordDoc operationRecordDoc = getOperationRecordDoc(contentMap);
             operationRecordDoc.setOperationName(operationName);
             retMap.put(operationName, operationRecordDoc);
             index++;
@@ -129,8 +132,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationRecordDoc getOperationRecordDoc(String content) {
+    private OperationRecordDoc getOperationRecordDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
 
         OperationRecordDoc operationRecordDoc = new OperationRecordDoc();
@@ -148,19 +154,19 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************术前讨论、术前小结****************************************************/
-    private Map<String, PreoperativeDiscussionDoc> getPreoperativeDiscussionDocMap(List<String> contents) {
+    private Map<String, PreoperativeDiscussionDoc> getPreoperativeDiscussionDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, PreoperativeDiscussionDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            PreoperativeDiscussionDoc preoperativeDiscussionDoc = getPreoperativeDiscussionDoc(content);
+            PreoperativeDiscussionDoc preoperativeDiscussionDoc = getPreoperativeDiscussionDoc(contentMap);
             preoperativeDiscussionDoc.setOperationName(operationName);
             retMap.put(operationName, preoperativeDiscussionDoc);
             index++;
@@ -168,8 +174,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
+    private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = new PreoperativeDiscussionDoc();
@@ -191,19 +200,19 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     );
 
     /**********************************************手术知情同意书****************************************************/
-    private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<String> contents) {
+    private Map<String, OperationInformedConsentDoc> getOperationInformedConsentDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationInformedConsentDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationInformedConsentDoc operationInformedConsentDoc = getOperationInformedConsentDoc(content);
+            OperationInformedConsentDoc operationInformedConsentDoc = getOperationInformedConsentDoc(contentMap);
             operationInformedConsentDoc.setOperationName(operationName);
             retMap.put(operationName, operationInformedConsentDoc);
             index++;
@@ -211,8 +220,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationInformedConsentDoc getOperationInformedConsentDoc(String content) {
+    private OperationInformedConsentDoc getOperationInformedConsentDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationInformedConsent_keyContrasts);
 
         OperationInformedConsentDoc operationInformedConsentDoc = new OperationInformedConsentDoc();
@@ -240,19 +252,19 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
 
 
     /**********************************************手术安全核查表****************************************************/
-    private Map<String, OperationSafetyChecklistDoc> getOperationSafetyChecklistDocMap(List<String> contents) {
+    private Map<String, OperationSafetyChecklistDoc> getOperationSafetyChecklistDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, OperationSafetyChecklistDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String operationName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             operationName = index + "";
-            OperationSafetyChecklistDoc operationSafetyChecklistDoc = getOperationSafetyChecklistDoc(content);
+            OperationSafetyChecklistDoc operationSafetyChecklistDoc = getOperationSafetyChecklistDoc(contentMap);
             operationSafetyChecklistDoc.setOperationName(operationName);
             retMap.put(operationName, operationSafetyChecklistDoc);
             index++;
@@ -260,8 +272,11 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
+    private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationSafetyChecklist_keyContrasts);
 
         OperationSafetyChecklistDoc operationSafetyChecklistDoc = new OperationSafetyChecklistDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouPathologyShipDocTrans extends ModelDocTrans {
     @Override
     public List<PathologyShipDoc> extract(MedrecVo medrecVo) {
         List<PathologyShipDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getPathologyShipDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getPathologyShipDoc(contentMap));
         });
         return retList;
     }
 
-    private PathologyShipDoc getPathologyShipDoc(String content) {
+    private PathologyShipDoc getPathologyShipDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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();

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

@@ -20,15 +20,19 @@ public class TaiZhouReasonableDiagnosisDocTrans extends ModelDocTrans {
     @Override
     public List<ReasonableDiagnosisDoc> extract(MedrecVo medrecVo) {
         List<ReasonableDiagnosisDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getReasonableDiagnosisDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getReasonableDiagnosisDoc(contentMap));
         });
         return retList;
     }
 
-    private ReasonableDiagnosisDoc getReasonableDiagnosisDoc(String content) {
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
+    private ReasonableDiagnosisDoc getReasonableDiagnosisDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         ReasonableDiagnosisDoc reasonableDiagnosisDoc = new ReasonableDiagnosisDoc();
         reasonableDiagnosisDoc.setStructureMap(structureMap);

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

@@ -20,15 +20,18 @@ public class TaiZhouRescueDocTrans extends ModelDocTrans {
     @Override
     public List<RescueDoc> extract(MedrecVo medrecVo) {
         List<RescueDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getRescueDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getRescueDoc(contentMap));
         });
         return retList;
     }
 
-    private RescueDoc getRescueDoc(String content) {
+    private RescueDoc getRescueDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         RescueDoc rescueDoc = new RescueDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouSeriouslyIllNoticeDocTrans 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));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getSeriouslyIllNoticeDoc(contentMap));
         });
         return retList;
     }
 
-    private SeriouslyIllNoticeDoc getSeriouslyIllNoticeDoc(String content) {
+    private SeriouslyIllNoticeDoc getSeriouslyIllNoticeDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         SeriouslyIllNoticeDoc seriouslyIllNoticeDoc = new SeriouslyIllNoticeDoc();

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

@@ -20,15 +20,18 @@ public class TaiZhouStagesSummaryDocTrans extends ModelDocTrans {
     @Override
     public List<StagesSummaryDoc> extract(MedrecVo medrecVo) {
         List<StagesSummaryDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
-        contents.forEach(content -> {
-            retList.add(getStagesSummaryDoc(content));
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
+        contentMaps.forEach(contentMap -> {
+            retList.add(getStagesSummaryDoc(contentMap));
         });
         return retList;
     }
 
-    private StagesSummaryDoc getStagesSummaryDoc(String content) {
+    private StagesSummaryDoc getStagesSummaryDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();

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

@@ -25,18 +25,21 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
     @Override
     public List<ThreeLevelWardDoc> extract(MedrecVo medrecVo) {
         List<ThreeLevelWardDoc> retList = Lists.newArrayList();
-        List<String> contents = (List) medrecVo.getContent().get("content");
+        List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
 
         ThreeLevelWardDoc result = new ThreeLevelWardDoc();
-        contents.forEach(content -> {
-            classifyThreeLevelWardDoc(result, content);
+        contentMaps.forEach(contentMap -> {
+            classifyThreeLevelWardDoc(result, contentMap);
         });
         retList.add(result);
         return retList;
     }
 
-    private void classifyThreeLevelWardDoc(ThreeLevelWardDoc result, String content) {
+    private void classifyThreeLevelWardDoc(ThreeLevelWardDoc result, Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(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);
 
         if (StringUtils.isEmpty(structureMap.get("查房日期"))) {

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

@@ -33,9 +33,9 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
         if (contentMap == null) {
             return transferRecordDoc;
         }
-        List<String> into = contentMap.get("转入记录");
-        List<String> out = contentMap.get("转出记录");
-        List<String> all = new ArrayList<>();
+        List<Map<String, Object>> into = (List) contentMap.get("转入记录");
+        List<Map<String, Object>> out = (List) contentMap.get("转出记录");
+        List<Map<String, Object>> all = new ArrayList<>();
         all.addAll(into);
         all.addAll(out);
         Map<String, TransferIntoDoc> transferIntoDocMap = getTransferIntoDocMap(into);
@@ -112,19 +112,19 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
 
 
     /**************************************************转入*******************************************************/
-    private Map<String, TransferIntoDoc> getTransferIntoDocMap(List<String> contents) {
+    private Map<String, TransferIntoDoc> getTransferIntoDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferIntoDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferIntoDoc transferIntoDoc = getTransferIntoDoc(content);
+            TransferIntoDoc transferIntoDoc = getTransferIntoDoc(contentMap);
             transferIntoDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferIntoDoc);
             index++;
@@ -132,9 +132,12 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferIntoDoc getTransferIntoDoc(String content) {
+    private TransferIntoDoc getTransferIntoDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), transferInto_keyContrasts);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferInto_keyContrasts);
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
         transferIntoDoc.setText(content);
@@ -147,19 +150,19 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
     private List<String> transferInto_keyContrasts = Lists.newArrayList();
 
     /**************************************************全部*******************************************************/
-    private Map<String, TransferRecordDoc> getTransferAllDocMap(List<String> contents) {
+    private Map<String, TransferRecordDoc> getTransferAllDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferRecordDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferRecordDoc transferRecordDoc = getTransferAllDoc(content);
+            TransferRecordDoc transferRecordDoc = getTransferAllDoc(contentMap);
             transferRecordDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferRecordDoc);
             index++;
@@ -167,9 +170,10 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferRecordDoc getTransferAllDoc(String content) {
+    private TransferRecordDoc getTransferAllDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), transferInto_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferInto_keyContrasts);
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
         transferAllDoc.setText(content);
         transferAllDoc.setStructureMap(structureMap);
@@ -178,19 +182,19 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
     }
 
     /**************************************************转出*******************************************************/
-    private Map<String, TransferOutDoc> getTransferOutDocMap(List<String> contents) {
+    private Map<String, TransferOutDoc> getTransferOutDocMap(List<Map<String, Object>> contentMaps) {
         Map<String, TransferOutDoc> retMap = Maps.newHashMap();
-        if (ListUtil.isEmpty(contents)) {
+        if (ListUtil.isEmpty(contentMaps)) {
             return retMap;
         }
         int index = 1;
         String transferRecordName = null;
-        for (String content : contents) {
-            if (StringUtil.isBlank(content)) {
+        for (Map<String, Object> contentMap : contentMaps) {
+            if (contentMap.get("xmlText") == null || StringUtil.isBlank(contentMap.get("xmlText").toString())) {
                 continue;
             }
             transferRecordName = index + "";
-            TransferOutDoc transferOutDoc = getTransferOutDoc(content);
+            TransferOutDoc transferOutDoc = getTransferOutDoc(contentMap);
             transferOutDoc.setTransferRecordName(transferRecordName);
             retMap.put(transferRecordName, transferOutDoc);
             index++;
@@ -198,9 +202,12 @@ public class TaiZhouTransferRecordDocTrans extends ModelDocTrans {
         return retMap;
     }
 
-    private TransferOutDoc getTransferOutDoc(String content) {
+    private TransferOutDoc getTransferOutDoc(Map<String, Object> contentMap) {
+        String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), transferOut_keyContrasts);
+        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
+        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, transferOut_keyContrasts);
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();
         transferOutDoc.setText(content);