Merge remote-tracking branch 'origin/shaoyf/dev-wsy' into shaoyf/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0013.java

@@ -22,8 +22,7 @@ import java.util.List;
 public class BEH0013 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null
-                || StringUtil.isBlank(inputInfo.getBeHospitalizedDoc().getChiefLabel().getText())) {
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             return;
         }
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
@@ -35,6 +34,8 @@ public class BEH0013 extends QCCatalogue {
             if (text.contains("无") || text.contains("否认")) {
                 return;
             }
+        } else {
+            return;
         }
         List<Clinical> clinicalNegative = new ArrayList<>();
         List<Clinical> clinicals = presentLabel.getClinicals();

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

@@ -28,8 +28,7 @@ public class BEH0014 extends QCCatalogue {
             , "药物", "误服", "查", "撞", "伤", "月经", "暴力", "超", "术");
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getBeHospitalizedDoc() == null
-                || StringUtil.isBlank(inputInfo.getBeHospitalizedDoc().getChiefLabel().getText())) {
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
@@ -45,7 +44,7 @@ public class BEH0014 extends QCCatalogue {
             }
         }*/
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
-        if (presentLabel == null) {
+        if (presentLabel == null || StringUtil.isBlank(presentLabel.getText())) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0400.java

@@ -7,7 +7,6 @@ import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -22,24 +21,26 @@ public class BEH0400 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getBeHospitalizedDoc() == null
-                || StringUtil.isBlank(inputInfo.getBeHospitalizedDoc().getChiefLabel().getText())) {
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
-        List<String>  Str =  Arrays.asList("咳嗽气喘史","胸闷心悸史","腹痛腹泻史","多饮多尿史","浮肿少尿史","尿频尿痛史","抽搐史","出血史","过敏史","药物过敏史","传染病史","外伤手术史","输血史","重大疾病史和治疗史");
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if (StringUtil.isBlank(pastLabel.getText())) {
+            status.set("0");
+            return;
+        }
+        List<String> Str = Arrays.asList("咳嗽气喘史", "胸闷心悸史", "腹痛腹泻史", "多饮多尿史", "浮肿少尿史", "尿频尿痛史", "抽搐史", "出血史", "过敏史", "药物过敏史", "传染病史", "外伤手术史", "输血史", "重大疾病史和治疗史");
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        for(String s : Str){
-            if(structureMap!=null &&structureMap.containsKey(s)){
+        for (String s : Str) {
+            if (structureMap != null && structureMap.containsKey(s)) {
                 status.set("0");
                 return;
             }
         }
 
-        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         if (pastLabel != null && StringUtil.isNotBlank(pastLabel.getText())) {
             status.set("0");
         }
     }
-
 }