义务中心医院：术前讨论、术前小结页面显示修改

trans/src/main/java/com/lantone/qc/trans/ywzxyy/util/YwzxyyPreoperativeDiscussionXmlAnalysis.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;
 
@@ -37,7 +38,7 @@ public class YwzxyyPreoperativeDiscussionXmlAnalysis implements YwzxyyXmlAnalysi
         Map<String, String> level1StructureMap = Maps.newHashMap();
         try {
             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();
@@ -49,6 +50,12 @@ public class YwzxyyPreoperativeDiscussionXmlAnalysis implements YwzxyyXmlAnalysi
             );
             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);
         }
@@ -59,7 +66,7 @@ public class YwzxyyPreoperativeDiscussionXmlAnalysis implements YwzxyyXmlAnalysi
         Map<String, String> level1StructureMap = Maps.newHashMap();
         try {
             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();
@@ -71,6 +78,12 @@ public class YwzxyyPreoperativeDiscussionXmlAnalysis implements YwzxyyXmlAnalysi
             );
             CommonAnalysisUtil.cutByTitlesNoColon(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);
         }
@@ -99,6 +112,12 @@ public class YwzxyyPreoperativeDiscussionXmlAnalysis implements YwzxyyXmlAnalysi
             CommonAnalysisUtil.cutByTitlesNoColon(level2Text, level2Titles, 0, level2StructureMap);
             level2StructureMap = removeSerialNumber(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);
         }