义务中心医院：会诊记录页面显示修改

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

@@ -125,13 +125,7 @@ public class YwzxyyConsultationDocTrans extends ModelDocTrans {
     }
 
     // 会诊记录映射字段
-    private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
-            "事件日期=记录时间",
-            "医生=记录医师",
-            "会诊执行情况=会诊情况",
-            "记录医师签名=记录医生",
-            "记录医师=记录医生"
-    );
+    private List<String> consultationRecord_keyContrasts = Lists.newArrayList();
 
 
     /**************************************************会诊结果单*******************************************************/

trans/src/main/java/com/lantone/qc/trans/ywzxyy/util/YwzxyyConsultationRecordXmlAnalysis.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,7 +24,7 @@ public class YwzxyyConsultationRecordXmlAnalysis 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();
@@ -31,6 +32,12 @@ public class YwzxyyConsultationRecordXmlAnalysis implements YwzxyyXmlAnalysis {
             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, "会诊目的", "请会诊目的");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }