Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH0397.java

@@ -47,7 +47,7 @@ public class BEH0397 extends QCCatalogue {
             familyText = familyLabel.getText();
             familiesFl = familyLabel.getFamilies();
         }
-        if (maritalLabel != null) {
+        if (maritalLabel != null && StringUtil.isNotBlank(maritalLabel.getText())) {
             maritalText = maritalLabel.getText();
             familiesMl = maritalLabel.getFamily();
         }
@@ -59,9 +59,9 @@ public class BEH0397 extends QCCatalogue {
         }
         if ((StringUtil.isNotBlank(familyText)
                 && ((familyText.contains("父") || familyText.contains("双亲") || familyText.contains("母"))
-                && (familyText.contains("详见原病历") || familyText.contains("已故") || familyText.contains("体健") || familyText.contains("去世")))
-                || ((maritalText.contains("父") || maritalText.contains("双亲") || maritalText.contains("母"))
-                && (maritalText.contains("详见原病历") || maritalText.contains("已故") || maritalText.contains("体健") || maritalText.contains("去世"))))) {
+                && (familyText.contains("详见原病历") || familyText.contains("已故") || familyText.contains("体健") || familyText.contains("去世") || familyText.contains("健康")))
+                || (StringUtil.isNotBlank(maritalText) && ((maritalText.contains("父") || maritalText.contains("双亲") || maritalText.contains("母"))
+                && (maritalText.contains("详见原病历") || maritalText.contains("已故") || maritalText.contains("体健") || maritalText.contains("去世") || familyText.contains("健康")))))) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR03077.java

@@ -276,7 +276,7 @@ public class THR03077 extends QCCatalogue {
         }
     }
 
-    List<String> usageWords = Lists.newArrayList("WB", "wb");
+    List<String> usageWords = Lists.newArrayList("WB", "wb", "泵");
 
     /**
      * 收集各模块药品信息