Merge branch 'beilun/dev' of D:\java_workspace\qc with conflicts.

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0014.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Component
 public class BEH0014 extends QCCatalogue {
     private List<String> containList = Arrays.asList("体检", "发现", "检查", "因", "确诊", "诊断", "复查", "术后"
-            , "药物", "误服", "查", "撞", "伤", "月经", "暴力", "超", "术");
+            , "药物", "误服", "查", "撞", "伤", "月经", "暴力", "超", "术", "去世");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0026.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Allergy;
-import com.lantone.qc.pub.model.entity.AllergyFood;
 import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -40,7 +39,8 @@ public class BEH0026 extends QCCatalogue {
             return;
         }
         String pastText = pastLabel.getText();
-        if (pastText.contains("食物过敏") || pastText.contains("详见原病历") || pastText.contains("芒果过敏") || pastText.contains("食物、药物过敏")) {
+        if (pastText.contains("食物过敏") || pastText.contains("详见原病历") || pastText.contains("芒果过敏") || pastText.contains("食物、药物过敏")
+                || pastText.contains("食物及药物")) {
             status.set("0");
             return;
         }
@@ -52,18 +52,6 @@ public class BEH0026 extends QCCatalogue {
                     //                            && i.getAllergyFood() != null
                     //                            && StringUtil.isNotBlank(i.getAllergyFood().getName())
             ).count();
-            if (count > 0) {
-                status.set("0");
-                return;
-            }
-        }
-
-        List<AllergyFood> allergyFoods = pastLabel.getAllergyFoods();
-        if (ListUtil.isNotEmpty(allergyFoods)) {
-            long count = allergyFoods.stream().filter(
-                    i -> i != null
-                            && StringUtil.isNotBlank(i.getName())
-            ).count();
             if (count > 0) {
                 status.set("0");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0029.java

@@ -48,7 +48,7 @@ public class BEH0029 extends QCCatalogue {
         }
         if (pastLabel != null) {
             String pastText = pastLabel.getText();
-            if (StringUtil.isNotBlank(pastText) && (pastText.contains("详见原病历") || pastText.contains("预防接种"))) {
+            if (StringUtil.isNotBlank(pastText) && (pastText.contains("详见原病历") || pastText.contains("接种"))) {
                 status.set("0");
                 return;
             }
@@ -62,7 +62,7 @@ public class BEH0029 extends QCCatalogue {
         }
         if (personalLabel != null) {
             String personText = personalLabel.getText();
-            if (StringUtil.isNotBlank(personText) && (personText.contains("详见原病历") || personText.contains("预防接种"))) {
+            if (StringUtil.isNotBlank(personText) && (personText.contains("详见原病历") || personText.contains("接种"))) {
                 status.set("0");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0030.java

@@ -48,7 +48,7 @@ public class BEH0030 extends QCCatalogue {
         }
         String pastText = pastLabel.getText();
         if (pastText.contains("肝炎") || pastText.contains("结核") || pastText.contains("详见原病历")
-                || pastText.contains("乙肝")) {
+                || pastText.contains("乙肝") || pastText.contains("传染病")) {
             status.set("0");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0058.java

@@ -67,7 +67,7 @@ public class BEH0058 extends QCCatalogue {
         }
         if (StringUtil.isNotBlank(maritalText)) {
             List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
-                    , "0-0-0-0", "详见原病历", "0－0－0－0");
+                    , "0-0-0-0", "详见原病历", "0－0－0－0", "一子一女", "一子二女");
             for (String word : words) {
                 if (maritalText.contains(word)) {
                     status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0444.java

@@ -51,7 +51,7 @@ public class BEH0444 extends QCCatalogue {
             if (ListUtil.isNotEmpty(generals)) {
                 for (GeneralDesc general : generals) {
                     for (String word : words) {
-                        if (general.getName().contains(word)) {
+                        if (general.getName().contains(word)){
                             status.set("0");
                             return;
                         }
@@ -62,7 +62,7 @@ public class BEH0444 extends QCCatalogue {
             if (ListUtil.isNotEmpty(gens)) {
                 for (General general : gens) {
                     for (String word : words) {
-                        if (general.getName().contains(word)) {
+                        if (general.getName().contains(word)){
                             status.set("0");
                             return;
                         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0454.java

@@ -38,7 +38,7 @@ public class BEH0454 extends QCCatalogue {
             return;
         }
         if (StringUtils.isNotEmpty(pastLabel.getHeathCondition()) || pastLabel.getText().contains("既往")
-                || pastLabel.getText().contains("平素") || pastLabel.getText().contains("详见原病历")) {
+                || pastLabel.getText().contains("平素") || pastLabel.getText().contains("病史") || pastLabel.getText().contains("详见原病历")) {
             status.set("0");
         }
         //既往有任一阳性疾病名称，则认为有健康状况

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/threelevelward/THR0134.java

@@ -41,7 +41,7 @@ public class THR0134 extends QCCatalogue {
         String content = firstAttendStructureMap.get("病情记录");
         if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") || content.contains("当前诊断") ||
                 content.contains("考虑诊断") || content.contains("诊断考虑") || content.contains("诊断基本明确") || content.contains("初步诊断") ||
-                content.contains("诊断为") || regexFind(content, "诊断", "基本明确")|| content.contains("查房认为")) {
+                content.contains("诊断为") || regexFind(content, "诊断", "基本明确") || content.contains("查房认为") || content.contains("CT示")) {
             status.set("0");
             return;
         }