北仑trans层入院记录空指针bug修改

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

@@ -59,11 +59,13 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
 
         //医生签名、医生签名时间
         Element docSignElement = null, docSignTimeElement = null;
-        for (Element disTableElementNt : disTableElement.nextElementSiblings()) {
-            docSignElement = disTableElementNt.selectFirst("image,img");
-            if (docSignElement != null) {
-                docSignTimeElement = disTableElementNt.nextElementSibling();
-                break;
+        if (disTableElement != null) {
+            for (Element disTableElementNt : disTableElement.nextElementSiblings()) {
+                docSignElement = disTableElementNt.selectFirst("image,img");
+                if (docSignElement != null) {
+                    docSignTimeElement = disTableElementNt.nextElementSibling();
+                    break;
+                }
             }
         }
         if (docSignElement != null) {
@@ -75,14 +77,16 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
 
         //专科检查、辅助检查
         Element yuElement = new Element("div");
-        for (Element tgjcTableElementNt : tgjcTableElement.nextElementSiblings()) {
-            if (tgjcTableElementNt.id().contains("table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1")) {
-                break;
-            }
-            if (tgjcTableElementNt.tagName().equals("table")) {
-                continue;
+        if (tgjcTableElement != null) {
+            for (Element tgjcTableElementNt : tgjcTableElement.nextElementSiblings()) {
+                if (tgjcTableElementNt.id().contains("table7_2_0_0_1_1_2_0_1_4_5_6_7_0_1")) {
+                    break;
+                }
+                if (tgjcTableElementNt.tagName().equals("table")) {
+                    continue;
+                }
+                tgjcTableElementNt.appendTo(yuElement);
             }
-            tgjcTableElementNt.appendTo(yuElement);
         }
         String yuText = BeiLunHtmlAnalysisUtil.blockDivToStr(yuElement, true)
                 .replace("体  格  检  查  表 （二）", "")
@@ -131,7 +135,7 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
     }
 
     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/beilun/util/BeiLunLeaveHospitalHtmlAnalysis.java

@@ -29,6 +29,7 @@ public class BeiLunLeaveHospitalHtmlAnalysis implements BeiLunHtmlAnalysis {
             htmlContent = htmlContent.replaceAll("[   ]", " ");
             CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
         }
+        CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
         BeiLunHtmlAnalysisUtil.insertModuleId(recTitle, structureMap);
         return structureMap;
     }