义务中心医院：死亡病例讨论记录页面显示修改

trans/src/main/java/com/lantone/qc/trans/ywzxyy/YwzxyyDeathCaseDiscussDocTrans.java

@@ -53,11 +53,6 @@ public class YwzxyyDeathCaseDiscussDocTrans extends ModelDocTrans {
         return deathCaseDiscussDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList(
-            "科示教室主持人=主持人",
-            "医生办公室主持人=主持人",
-            "上级医师签名=主持人签名",
-            "医师签名=记录医师"
-    );
+    private List<String> keyContrasts = Lists.newArrayList();
 
 }

trans/src/main/java/com/lantone/qc/trans/ywzxyy/util/YwzxyyDeathCaseDiscussXmlAnalysis.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.ywzxyy.util;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.dbanaly.facade.ywzxyy.YwzxyyXmlUtil;
+import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import lombok.extern.slf4j.Slf4j;
 
@@ -23,18 +24,26 @@ public class YwzxyyDeathCaseDiscussXmlAnalysis implements YwzxyyXmlAnalysis {
         try {
             String xml = args[0];
             String level1Text = YwzxyyXmlUtil.bcXmlAna(xml);
-            List<String> level1Titles = CommonAnalysisUtil.sortTitles(Lists.newArrayList("病历记录时间", "病历记录标题", "原始文本", "医师签名", "主持人签名", "上级医师签名"), level1Text);
+            List<String> level1Titles = CommonAnalysisUtil.sortTitles(Lists.newArrayList("病历记录时间", "病历记录标题", "原始文本", "医师签名", "记录医师", "主持人签名", "上级医师签名"), level1Text);
             CommonAnalysisUtil.cutByTitles(level1Text, level1Titles, 0, level1StructureMap);
 
             Map<String, String> level2StructureMap = Maps.newHashMap();
             String level2Text = level1StructureMap.get("原始文本");
             List<String> level2Titles = CommonAnalysisUtil.sortTitles(
                     Lists.newArrayList("入院日期时间", "死亡日期时间", "入院诊断", "死亡诊断", "讨论时间", "地点", "医生办公室主持人",
-                            "科示教室主持人", "主持人", "参加人员", "主管医师报告病史", "讨论摘要", "主持人总结发言", "简要病情", "死亡原因", "经验教训", "诊疗计划"),
+                            "科示教室主持人", "主持人", "参加人员", "主管医师报告病史", "讨论摘要", "主持人总结发言", "简要病情"),
                     level2Text
             );
             CommonAnalysisUtil.cutByTitles(level2Text, level2Titles, 0, level2StructureMap);
             level1StructureMap.putAll(level2StructureMap);
+
+            MapUtil.keyAssig(level1StructureMap, "记录时间", "病历记录时间");
+            MapUtil.keyAssig(level1StructureMap, "记录医生", "医师签名", "记录医师");
+            MapUtil.keyAssig(level1StructureMap, "主持人签名", "上级医师签名");
+            MapUtil.keyAssig(level1StructureMap, "入院日期", "入院日期时间");
+            MapUtil.keyAssig(level1StructureMap, "死亡时间", "死亡日期时间");
+            MapUtil.keyAssig(level1StructureMap, "讨论地点", "地点");
+            MapUtil.keyAssig(level1StructureMap, "主持人", "医生办公室主持人", "科示教室主持人");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }