北仑模块key标准化

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

@@ -44,7 +44,7 @@ public class BeiLunCrisisValueReportDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-
+        "病情记录=病情分析及处理"
     );
 
 }

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

@@ -26,7 +26,7 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
         String recTitle = contentMap.get("recTitle").toString();
         String recTypeId = contentMap.get("recTypeId").toString();
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunDeathCaseDiscussHtmlAnalysis();
-        Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle);
+        Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(structureMap);
@@ -35,7 +35,11 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-
+        "医生签名时间=记录时间",
+        "主持人小结意见=主持人小结",
+        "具体讨论意见=讨论内容",
+        "记录者签名=记录医生",
+        "主持人（签名）=主持人签名"
     );
 
 }

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

@@ -43,7 +43,8 @@ public class BeiLunRescueDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-
+            "病历标题=标题",
+            "病情记录=抢救内容"
     );
 
 }

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

@@ -44,7 +44,8 @@ public class BeiLunStagesSummaryDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-
+            "病历标题=标题",
+            "病情记录=病历内容"
     );
 
 }

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

@@ -15,13 +15,7 @@ import com.lantone.qc.trans.beilun.util.BeiLunTransferIntoHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.TransferOutHtmlAnalysis;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * @Description: 转科记录文档生成
@@ -230,6 +224,9 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
+            "医师签名=记录医生",
+            "病历标题=标题",
+            "病情记录=病历内容"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunDeathCaseDiscussHtmlAnalysis.java

@@ -32,7 +32,8 @@ public class BeiLunDeathCaseDiscussHtmlAnalysis implements BeiLunHtmlAnalysis {
         bigDivElement.child(0).lastElementSibling().remove();
 
         String text = BeiLunHtmlAnalysisUtil.blockDivToStr(bigDivElement, false);
-        List<String> titles = Lists.newArrayList("入院诊断", "死亡诊断", "尸检结果", "讨论时间", "讨论地点",
+        List<String> titles = Lists.newArrayList("姓名", "性别", "出生日期", "科别", "病区", "床号", "住院号",
+                "入院诊断", "死亡诊断", "尸检结果", "讨论时间", "讨论地点",
                 "主 持 人", "参加人员", "具体讨论意见", "主持人小结意见", "主持人（签名）", "记录者签名");
         CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, map);
         BeiLunHtmlAnalysisUtil.mapValueRemoveStartColon(map);
@@ -41,7 +42,7 @@ public class BeiLunDeathCaseDiscussHtmlAnalysis implements BeiLunHtmlAnalysis {
     }
 
     public static void main(String[] args) {
-        String html = FileUtil.fileRead("C:/Users/Administrator/Desktop/宁波/病例导出/死亡病例讨论-EICU-2258383.html");
+        String html = FileUtil.fileRead("D:\\朗通/病例导出/死亡病例讨论-EICU-2258383.html");
         String recTitle = "死亡病例讨论";
         BeiLunDeathCaseDiscussHtmlAnalysis test = new BeiLunDeathCaseDiscussHtmlAnalysis();
         Map<String, String> map = test.analysis(html, recTitle);

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunOperationRecordHtmlAnalysis.java

@@ -3,6 +3,7 @@ package com.lantone.qc.trans.beilun.util;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.pub.util.FileUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 
@@ -34,7 +35,7 @@ public class BeiLunOperationRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
                 CommonAnalysisUtil.cutByTitles(operatingCrew, Lists.newArrayList("主刀", "一助", "二助", "洗手护士"), 0, map);
             }
         }
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
+        BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         //找不到模板id,用默认标准模板
         map.putIfAbsent("mode_id", "407");
         return map;