入院记录、首程病程录修改

trans/src/main/java/com/lantone/qc/trans/ningbozhongyi/NingBoZhongYiBeHospitalizedDocTrans.java

@@ -67,6 +67,7 @@ public class NingBoZhongYiBeHospitalizedDocTrans extends ModelDocTrans {
             "医生签名=记录医生",
             "疼痛评估=疼痛",
             "代诉=主诉"
+//            "西医诊断"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/ningbozhongyi/util/NingBoZhongYiBeHospitalizedHtmlAnalysis.java

@@ -63,6 +63,20 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
             map.put("月经史", map.get("婚育史").substring(map.get("婚育史").indexOf("月经史") + 4));
             map.put("婚育史", map.get("婚育史").substring(0, map.get("婚育史").indexOf("月经史")));
         }
+//
+
+        if (map.get("性别").equals("女")){
+            if (map.get("婚育史").contains("月经史")) {
+                map.put("月经史", map.get("婚育史").substring(map.get("婚育史").indexOf("月经史") + 4));
+                map.put("婚育史", map.get("婚育史").substring(0, map.get("婚育史").indexOf("月经史")));
+            }
+        }
+        if (map.get("性别").equals("男")){
+            if (StringUtil.isNotBlank("月经史")) {
+                map.put("婚育史",map.get("月经史"));
+            }
+        }
+
         //体 格 检 查 表（一） table解析
         Element tgjcTableElement = doc.getElementById("table4");
         NingBoZhongYiHtmlAnalysisUtil.tableStyle2InsertMap(tgjcTableElement, map);
@@ -80,16 +94,24 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
         }
 
         NingBoZhongYiHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
+//        disHandleExt(map);
 
+        if (!StringUtil.isNotBlank(map.get("初步诊断"))){
+            if (StringUtil.isNotBlank(map.get("中医诊断"))){
+                map.put("初步诊断","中医诊断"+map.get("中医诊断").replace("\n",""));
+            }
+            if (StringUtil.isNotBlank(map.get("西医诊断"))){
+                map.put("初步诊断","西医诊断："+map.get("西医诊断").replace("\n",""));
+            }
+        }
         if (StringUtil.isNotBlank(map.get("补充诊断"))) {
             map.put("补充诊断", map.get("补充诊断").replace(" ","").replace("\n", " "));
             map.put("初步诊断", map.get("初步诊断") + " 补充诊断：" + map.get("补充诊断"));
         }
         if(StringUtil.isNotBlank(map.get("最后诊断"))){
             map.put("最后诊断", map.get("最后诊断").replace(" ","").replace("\n", " "));
-            map.put("初步诊断", map.get("初步诊断") + " 最后诊断：" + map.get("最后诊断"));
+            map.put("初步诊断", map.get("初步诊断") + " 最后诊断：" + map.get("最后诊断").replace("null",""));
         }
-        //disHandleExt(map);
 
         //医生签名、医生签名时间
         Element docSignElement = null, docSignTimeElement = null;
@@ -133,6 +155,7 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
                 .trim()*/;
         CommonAnalysisUtil.cutByTitles(yuText, Lists.newArrayList("专科检查", "辅助检查"), 0, map);
 
+
     }
 
     //24小时出入院记录、24小时出入院记录（全院）、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)
@@ -173,7 +196,7 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
     }
 
     private void disHandleExt(Map<String, String> map) {
-        String[] keys = {"补充诊断", "修正诊断"};
+        String[] keys = {"中医诊断", "西医诊断"};
         String value = null;
         int index = 0;
         for (String key : keys) {

trans/src/main/java/com/lantone/qc/trans/ningbozhongyi/util/NingBoZhongYiFirstCourseRecordHtmlAnalysis.java

@@ -25,7 +25,7 @@ public class NingBoZhongYiFirstCourseRecordHtmlAnalysis implements NingBoZhongYi
     public Map<String, String> analysis(String... args) {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
-            List<String> titles = Lists.newArrayList("病例特点", "拟诊讨论", "中医辨病辨证依据", "中医鉴别诊断", "西医诊断依据", "西医鉴别诊断", "初步诊断", "病情评估", "诊疗计划");
+            List<String> titles = Lists.newArrayList("病例特点", "拟诊讨论",  "中医辨病辨证依据", "中医鉴别诊断","西医鉴别诊断","鉴别诊断","西医诊断依据","诊断依据", "初步诊断",  "病情评估", "诊疗计划");
             String html = args[0];
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);
@@ -41,15 +41,20 @@ public class NingBoZhongYiFirstCourseRecordHtmlAnalysis implements NingBoZhongYi
                 }
                 titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
                 CommonAnalysisUtil.cutByTitles(htmlContent, titles, 0, structureMap);
-                structureMap.put("诊断依据", "中医辨病辨证依据：" + structureMap.get("中医辨病辨证依据") + "西医诊断依据：" + structureMap.get("西医诊断依据"));
-                structureMap.put("鉴别诊断", "中医鉴别诊断：" + structureMap.get("中医鉴别诊断") + "西医鉴别诊断：" + structureMap.get("西医鉴别诊断"));
-
+                if (structureMap.get("中医辨病辨证依据")!=null&&structureMap.get("西医诊断依据")!=null){
+                    structureMap.put("诊断依据", "中医辨病辨证依据：" + structureMap.get("中医辨病辨证依据") + "西医诊断依据：" + structureMap.get("西医诊断依据"));
+                }
+                if (structureMap.get("中医鉴别诊断")!=null&&structureMap.get("西医鉴别诊断")!=null){
+                    structureMap.put("鉴别诊断", "中医鉴别诊断：" + structureMap.get("中医鉴别诊断") + "西医鉴别诊断：" + structureMap.get("西医鉴别诊断"));
+                }
             }
 
             NingBoZhongYiHtmlAnalysisUtil.insertModuleId(modeId, recTitle, structureMap);
             //        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
             //        structureMap.forEach((k,v)-> System.out.println(k + "------" + v));
             //        structureMap.put("rec_title=", "107");
+
+            structureMap.put("诊疗计划",structureMap.get("诊疗计划").replace("医生签名",""));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

trans/src/main/java/com/lantone/qc/trans/ningbozhongyi/util/NingBoZhongYiLeaveHospitalHtmlAnalysis.java

@@ -39,6 +39,7 @@ public class NingBoZhongYiLeaveHospitalHtmlAnalysis implements NingBoZhongYiHtml
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replace("提示信息：诊治经过、出院情况和出院医嘱可通过右键选择专科知识库进行插入", "");
                 htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
+                htmlContent = htmlContent.replace("特殊检查资料号","");
                 htmlContent = htmlContent.replace("\n", "");
                 List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, htmlContent.replace("复诊时间", ""));
                 sortTitles.add("时间");