宁海第一人民医院：bug处理

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/behospitalized/BEH0053.java

@@ -46,7 +46,7 @@ public class BEH0053 extends QCCatalogue {
         }
         String maritalText = maritalLabel.getText();
         if ("未婚".equals(marry) || maritalText.contains("未婚") || maritalText.contains("详见原病历")
-                || maritalText.contains("离婚") || maritalText.contains("离异") || maritalText.contains("适龄结婚")
+                || maritalText.contains("离婚") || maritalText.contains("离异") || maritalText.contains("结婚")
                 || maritalText.contains("丧偶")|| maritalText.contains("见旧病历") || maritalText.contains("见既往病历")) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/ninghaiyiyi/firstpagerecord/FIRP02972.java

@@ -25,7 +25,10 @@ public class FIRP02972 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String address = firstpageStructureMap.get(Content.current_address);
             if (!CatalogueUtil.isEmpty(address)) {
-                String suffix = (address.length()<=5)?address:(address.substring(address.length()-5));
+                String suffix = (address.length() <= 5) ? address : (address.substring(address.length() - 5));
+                if (suffix.contains("村")) {
+                    return;
+                }
                 Pattern p = Pattern.compile("[0-9一二三四五六七八九０１２３４５６７８９]");
                 Matcher m = p.matcher(suffix);
                 if (!m.find()) {

trans/src/main/java/com/lantone/qc/trans/ninghaiyiyi/util/NingHaiYiYiCrisisValueReportHtmlAnalysis.java

@@ -28,7 +28,7 @@ public class NingHaiYiYiCrisisValueReportHtmlAnalysis implements NingHaiYiYiHtml
             String recTitle = args[1];
             String recTypeId = args[2];
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0).getElementById("main");
-            analysisGeneral(recTitle,bigDivElement, map);
+            analysisGeneral(recTitle, bigDivElement, map);
             NingHaiYiYiHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -36,7 +36,7 @@ public class NingHaiYiYiCrisisValueReportHtmlAnalysis implements NingHaiYiYiHtml
         return map;
     }
 
-    private void analysisGeneral(String recTitle,Element bigDivElement, Map<String, String> map) {
+    private void analysisGeneral(String recTitle, Element bigDivElement, Map<String, String> map) {
         if (bigDivElement.childNodeSize() == 1) {
             bigDivElement = bigDivElement.child(0);
         }
@@ -44,7 +44,7 @@ public class NingHaiYiYiCrisisValueReportHtmlAnalysis implements NingHaiYiYiHtml
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
         }
         String text = NingHaiYiYiHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
-        CommonAnalysisUtil.extractWardInfo(recTitle,text, map);
+        CommonAnalysisUtil.NHExtractWardInfo(recTitle, text, map);
         String bqjlText = "病情记录" + map.get("病情记录");
         List<String> titles = Lists.newArrayList(
                 "病情记录"