宁波中医院修改

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

@@ -316,12 +316,11 @@ public class NingBoZhongYiOperationDocTrans extends ModelDocTrans {
             "7.主要术中、术后风险及防范措施=风险及防范措施",
             "8.主要术中、术后风险及防范措施=风险及防范措施",
             "9.术中、术后注意事项（含护理事项）=术中术后注意事项",
-            "8.术中、术后注意事项（含护理事项）=术中术后注意事项",
+            "8.术中、术后注意事项（含护理事项）=术中术后注意事项"
             //"术中、术后注意事项（含护理事项）=术后注意事项",
             //"拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
             //"术前特殊准备=术前准备",
             //"手术指征与禁忌征=手术指征与禁忌",
-            "经治医生签字时间=记录时间"
     );
 
     /**********************************************手术知情同意书****************************************************/

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

@@ -55,8 +55,13 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
         map.put("记录时间", map.get("记录日期"));
         //主诉、现病史等table解析
         NingBoZhongYiHtmlAnalysisUtil.tableStyle2InsertMap(doc.getElementById("table3"), map);
-        if (StringUtil.isNotBlank(map.get("婚育史月经史")) && map.get("婚育史月经史").contains("经期")) {
-            map.put("婚育史", map.get("婚育史月经史").substring(0, map.get("婚育史月经史").indexOf("经期")));
+        if (StringUtil.isNotBlank(map.get("婚育史月经史")) && map.get("婚育史月经史").contains("月经史")) {
+            map.put("月经史", map.get("婚育史月经史").substring(map.get("婚育史月经史").indexOf("月经史") + 4));
+            map.put("婚育史", map.get("婚育史月经史").substring(0, map.get("婚育史月经史").indexOf("月经史")));
+        }
+        if (StringUtil.isNotBlank(map.get("婚育史")) && map.get("婚育史").contains("月经史")) {
+            map.put("月经史", map.get("婚育史").substring(map.get("婚育史").indexOf("月经史") + 4));
+            map.put("婚育史", map.get("婚育史").substring(0, map.get("婚育史").indexOf("月经史")));
         }
         //体 格 检 查 表（一） table解析
         Element tgjcTableElement = doc.getElementById("table4");
@@ -74,12 +79,17 @@ public class NingBoZhongYiBeHospitalizedHtmlAnalysis implements NingBoZhongYiHtm
             }
         }
 
+        NingBoZhongYiHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
+
         if (StringUtil.isNotBlank(map.get("补充诊断"))) {
-            map.put("补充诊断", map.get("补充诊断").replace("\n", " "));
+            map.put("补充诊断", map.get("补充诊断").replace(" ","").replace("\n", " "));
+            map.put("初步诊断", map.get("初步诊断") + " 补充诊断：" + map.get("补充诊断"));
         }
-
-        NingBoZhongYiHtmlAnalysisUtil.tableStyle1InsertMap(disTableElement, map);
-        disHandleExt(map);
+        if(StringUtil.isNotBlank(map.get("最后诊断"))){
+            map.put("最后诊断", map.get("最后诊断").replace(" ","").replace("\n", " "));
+            map.put("初步诊断", map.get("初步诊断") + " 最后诊断：" + map.get("最后诊断"));
+        }
+        //disHandleExt(map);
 
         //医生签名、医生签名时间
         Element docSignElement = null, docSignTimeElement = null;

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

@@ -46,12 +46,11 @@ public class NingBoZhongYiDifficultCaseDiscussHtmlAnalysis implements NingBoZhon
                 String date = CommonAnalysisUtil.extractDate(structureMap.get("住院号"));
                 if (StringUtil.isNotBlank(date)) {
                     structureMap.put("时间", date);
-                    structureMap.put("住院号", structureMap.get("住院号").replace(date, "").replace("\n", ""));
-
+                    CommonAnalysisUtil.repKey(structureMap,"住院号","\n");
                 }
             }
             if (structureMap.containsKey("记录者（签名）")) {
-                    structureMap.put("记录医生", structureMap.get("记录者（签名）").replace(" ",""));
+                structureMap.put("记录医生", structureMap.get("记录者（签名）").replace(" ",""));
             }
             if (structureMap.containsKey("科主任（签名）")) {
                 String date1 = CommonAnalysisUtil.NBZYExtractDate(structureMap.get("科主任（签名）").replace(" ", ""));

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

@@ -68,7 +68,7 @@ public class NingBoZhongYiHtmlAnalysisUtil {
             } else if (tdText.contains("中医诊断：") && tdText.contains("西医诊断：")) {
                 List<String> titles = Lists.newArrayList("中医诊断", "西医诊断");
                 CommonAnalysisUtil.cutByTitles(tdText, titles, 0, map);
-                map.put("初步诊断", "中医诊断：" + map.get("中医诊断") + "西医诊断：" + map.get("西医诊断"));
+                map.put("初步诊断", "中医诊断：" + map.get("中医诊断") + " 西医诊断：" + map.get("西医诊断"));
             } else {
                 map.put(
                         StringUtil.removeBlank(tdText.substring(0, tdMhIndex)),

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

@@ -63,10 +63,12 @@ public class NingBoZhongYiPreoperativeHtmlAnalysis implements NingBoZhongYiHtmlA
                 "术前诊断", "手术指征", "拟施手术名称及方式", "拟施麻醉方式", "其他术前相关情况", "注意事项",
                 "经治医师签名", "经治医师签字时间", "主刀医师签名", "医生签名", "主刀医师签字时间");
         CommonAnalysisUtil.cutByTitles(text, titles, 0, map);
+        CommonAnalysisUtil.repKey(map,"经治医师签名","医生签名");
+        CommonAnalysisUtil.repKey(map,"主刀医师签名","医生签名");
         CommonAnalysisUtil.processType(map, "5.计划性多次手术");
-        CommonAnalysisUtil.processType(map, "5.本次手术是否属于计划性多次手术");
+        //CommonAnalysisUtil.processType(map, "5.本次手术是否属于计划性多次手术");
         CommonAnalysisUtil.processType(map, "讨论方式");
-        CommonAnalysisUtil.makeEmpty(map, "主刀医生签名");
+        //CommonAnalysisUtil.makeEmpty(map, "主刀医生签名");
         // 解决医生签名显示 年 月 日 时 分
         signatureTime(map);
     }