1.修改条目逻辑

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

@@ -4,6 +4,7 @@ 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.label.PastLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
@@ -20,11 +21,21 @@ public class BEH0027 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
-        List<Allergy> allergies = inputInfo.getBeHospitalizedDoc().getPastLabel().getAllergies();
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if (pastLabel == null) {
+            status.set("0");
+            return;
+        }
+        String pastText = pastLabel.getText();
+        if (StringUtil.isNotBlank(pastText) && pastText.contains("药物过敏史")) {
+            status.set("0");
+            return;
+        }
+        List<Allergy> allergies = pastLabel.getAllergies();
         if (ListUtil.isNotEmpty(allergies)) {
             long count = allergies.stream().filter(
                     i -> i != null

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -24,10 +25,10 @@ public class BEH0473 extends QCCatalogue {
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if (structureMap != null) {
-            if (!CatalogueUtil.isEmpty(structureMap.get("体温"))
-                    || !CatalogueUtil.isEmpty(structureMap.get("脉搏"))
-                    || !CatalogueUtil.isEmpty(structureMap.get("呼吸"))
-                    || !CatalogueUtil.isEmpty(structureMap.get("血压"))) {
+            if (StringUtil.isNotBlank(structureMap.get("体温"))
+                    || StringUtil.isNotBlank(structureMap.get("脉搏"))
+                    || StringUtil.isNotBlank(structureMap.get("呼吸"))
+                    || StringUtil.isNotBlank(structureMap.get("血压"))) {
                 status.set("0");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0257.java

@@ -34,8 +34,9 @@ public class FIRP0257 extends QCCatalogue {
             }
             List<String> firstpageDischargeDiag = getFirstpageDischargeDiag(outpatientEmergencyDiagList);
             List<String> dischargeDiag = getDischargeDiag(dischargeDiags);
+
             String situation = ""; //符合情况
-            if (ListUtil.equals(firstpageDischargeDiag,dischargeDiag)){
+            if (dischargeDiag.containsAll(firstpageDischargeDiag)){
                 situation = "符合";
             } else {
                 situation = "不符合";
@@ -43,7 +44,7 @@ public class FIRP0257 extends QCCatalogue {
             Object o_iObj = firstpageStructureMap.get(Content.o_i);
             if (o_iObj != null){
                 String o_i = o_iObj.toString();
-                if (!CatalogueUtil.isEmpty(o_i) && !CatalogueUtil.compareToken(o_i,situation)) {
+                if (StringUtil.isNotBlank(o_i) && !CatalogueUtil.compareToken(o_i,situation)) {
                     status.set("-1");
                 }
             }