台州运行质控修改bug

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

@@ -27,7 +27,7 @@ public class FIRP0187 extends QCCatalogue {
         Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
         String outWay = firstpageStructureMap.get(Content.outWay);
         String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy);
-        if (StringUtils.isEmpty(outWay) && StringUtils.isEmpty(deadAutopsy)) {
+        if (StringUtils.isEmpty(outWay) || StringUtils.isEmpty(deadAutopsy)) {
             status.set("0");
             return;
         }

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

@@ -28,11 +28,11 @@ public class FIRP0196 extends QCCatalogue {
             String brainInjuryComaAfterHours = firstpageStructureMap.get(Content.brainInjuryComaAfterHours);
             String brainInjuryComaAfterMins = firstpageStructureMap.get(Content.brainInjuryComaAfterMins);
             if (StringUtil.isBlank(brainInjuryComaBeforeDays)
-                    || StringUtil.isBlank(brainInjuryComaBeforeHours)
-                    || StringUtil.isBlank(brainInjuryComaBeforeMins)
-                    || StringUtil.isBlank(brainInjuryComaAfterDays)
-                    || StringUtil.isBlank(brainInjuryComaAfterHours)
-                    || StringUtil.isBlank(brainInjuryComaAfterMins)
+                    && StringUtil.isBlank(brainInjuryComaBeforeHours)
+                    && StringUtil.isBlank(brainInjuryComaBeforeMins)
+                    && StringUtil.isBlank(brainInjuryComaAfterDays)
+                    && StringUtil.isBlank(brainInjuryComaAfterHours)
+                    && StringUtil.isBlank(brainInjuryComaAfterMins)
             ) {
                 status.set("-1");
             }

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

@@ -28,6 +28,9 @@ public class FIRP0248 extends QCCatalogue {
             boolean match = false;
 
             String fpRescueNumStr = firstpageStructureMap.get("病人抢救次数");
+            if (StringUtil.isBlank(fpRescueNumStr)) {
+                return;
+            }
             if (StringUtil.isNotBlank(fpRescueNumStr) && CatalogueUtil.numbersOnly(fpRescueNumStr)) {
                 int fpRescueNum = Integer.parseInt(fpRescueNumStr);
                 if (fpRescueNum == rescueNum) {

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

@@ -1,10 +1,10 @@
 package com.lantone.qc.kernel.catalogue.firstpagerecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 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,8 +24,13 @@ public class FIRP02904 extends QCCatalogue {
         }
         if (inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.allergyDrug);
-            if (!CatalogueUtil.isEmpty(name)) {
+            String drugAllergy = firstpageStructureMap.get(Content.drugAllergy);
+            if (StringUtil.isBlank(drugAllergy) || "无".equals(drugAllergy)) {
+                status.set("0");
+                return;
+            }
+            String allergicDrugs = firstpageStructureMap.get(Content.allergyDrug);
+            if (StringUtil.isNotEmpty(allergicDrugs)) {
                 status.set("0");
             }
         }

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

@@ -26,11 +26,12 @@ public class FIRP02992 extends QCCatalogue {
             Map<String, String> fpStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String fpDrugAllergy = fpStructureMap.get(Content.drugAllergy);
             fpDrugAllergy = StringUtil.isBlank(fpDrugAllergy) ? "" : fpDrugAllergy;
-
             Map<String, String> beStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String beDrugAllergy = beStructureMap.get("过敏史");
             beDrugAllergy = StringUtil.isBlank(beDrugAllergy) ? "" : beDrugAllergy;
-
+            if ("无".equals(fpDrugAllergy) || StringUtil.isBlank(beDrugAllergy)) {
+                return;
+            }
             if (!fpDrugAllergy.equals(beDrugAllergy)) {
                 String regx = "；|;|,|，|、| ";
                 List<String> fpList = Lists.newArrayList(fpDrugAllergy.split(regx));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0636.java

@@ -33,7 +33,7 @@ public class OPE0636 extends QCCatalogue {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
                     if (operationDoc.getOperationRecordDoc() != null
-                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("主治医师"))) {
+                            && StringUtil.isBlank(operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师"))) {
                         flag = true;
                     }
                     return flag;