术前小结解析修改

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

@@ -24,8 +24,9 @@ public class BeiLunBeHospitalizedDocTrans extends ModelDocTrans {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
         String recTitle = contentMap.get("recTitle").toString();
+        String recTypeId = contentMap.get("recTypeId").toString();
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunBeHospitalizedHtmlAnalysis();
-        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);
 
         BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);

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

@@ -29,8 +29,9 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
         String recTitle = contentMap.get("recTitle").toString();
+        String recTypeId = contentMap.get("recTypeId").toString();
         BeiLunFirstCourseRecordHtmlAnalysis beiLunFirstCourseRecordHtmlAnalysis = new BeiLunFirstCourseRecordHtmlAnalysis();
-        Map<String, String> sourceMap = beiLunFirstCourseRecordHtmlAnalysis.analysis(content, recTitle);
+        Map<String, String> sourceMap = beiLunFirstCourseRecordHtmlAnalysis.analysis(content, recTitle, recTypeId);
         //Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         sourceMap = removeSerialNumber(sourceMap);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -23,6 +23,7 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
         Map<String, String> map = Maps.newLinkedHashMap();
         String html = args[0];
         String recTitle = args[1];
+        String recTypeId = args[2];
         Document doc = Jsoup.parse(html);
 
         if (recTitle.contains("24小时")) {
@@ -33,7 +34,7 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
             analysisGeneral(doc, recTitle, map);
         }
 
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTitle, map);
+        BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
         return map;
     }
 

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

@@ -41,7 +41,7 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
         if (structureMap.containsKey("（一）病历特点")) {
             CommonAnalysisUtil.cutByTitles(structureMap.get("（一）病历特点"), Lists.newArrayList("3.入院查体", "4.辅助检查"), 0, structureMap);
         }
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTitle, structureMap);
+        BeiLunHtmlAnalysisUtil.insertModuleId(args[2], structureMap);
 //        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
 //        structureMap.forEach((k,v)-> System.out.println(k + "------" + v));
 //        structureMap.put("rec_title=", "107");