bug修改

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

@@ -3,11 +3,9 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 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.Clinical;
 import com.lantone.qc.pub.model.entity.Family;
-import com.lantone.qc.pub.model.entity.Menses;
 import com.lantone.qc.pub.model.label.FamilyLabel;
-import com.lantone.qc.pub.model.label.MenstrualLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +24,10 @@ public class BEH0070 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
+            if (ListUtil.isEmpty(families)) {
+                status.set("0");
+                return;
+            }
             boolean isFindGeneticDiseaseKeyword = false, isFindDiagInfectious = false;
             for (Family family : families) {
                 if (family.getGeneticDiseaseKeyword() != null && StringUtil.isNotBlank(family.getGeneticDiseaseKeyword().getName())) {

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Dead;
 import com.lantone.qc.pub.model.entity.Family;
 import com.lantone.qc.pub.model.label.FamilyLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -21,24 +22,28 @@ import java.util.List;
 public class BEH0072 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
+            if (ListUtil.isEmpty(families)) {
+                return;
+            }
             int deadObjectNum = 0;
             for (Family family : families) {
                 if (family.getDead() == null) {
                     deadObjectNum++;
                 } else {
                     Dead dead = family.getDead();
-                    if ((dead.getDeadReason() != null && StringUtil.isNotBlank(dead.getDeadReason().getName())
-                            || (dead.getUnknow() != null && StringUtil.isNotBlank(dead.getUnknow().getName())))) {
-                        status.set("0");
+                    if (dead.getDeadReason() != null && StringUtil.isBlank(dead.getDeadReason().getName())
+                            && dead.getUnknow() != null && StringUtil.isBlank(dead.getUnknow().getName())) {
+                        status.set("-1");
                         return;
                     }
                 }
             }
-            if (deadObjectNum == families.size()){
-                status.set("0");
+            if (deadObjectNum != families.size()) {
+                status.set("-1");
             }
         }
     }

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

@@ -20,6 +20,7 @@ import java.util.List;
 public class BEH0074 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
@@ -28,9 +29,9 @@ public class BEH0074 extends QCCatalogue {
                     continue;
                 }
                 for (Diag diag : family.getDiags()) {
-                    if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")
-                            || diag.getHospitalDiagName().contains("癌") || diag.getHospitalDiagName().contains("肿瘤")) {
-                        status.set("0");
+                    if (!diag.getName().contains("癌") && !diag.getName().contains("肿瘤")
+                            && !diag.getHospitalDiagName().contains("癌") && !diag.getHospitalDiagName().contains("肿瘤")) {
+                        status.set("-1");
                         return;
                     }
                 }

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

@@ -3,9 +3,9 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 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.Diag;
 import com.lantone.qc.pub.model.entity.Family;
 import com.lantone.qc.pub.model.label.FamilyLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -21,12 +21,16 @@ import java.util.List;
 public class BEH0075 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
             FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
             List<Family> families = familyLabel.getFamilies();
+            if (ListUtil.isEmpty(families)) {
+                return;
+            }
             for (Family family : families) {
-                if (family.getSimilarDiag() != null && StringUtil.isNotBlank(family.getSimilarDiag().getName())) {
-                    status.set("0");
+                if (family.getSimilarDiag() == null || StringUtil.isBlank(family.getSimilarDiag().getName())) {
+                    status.set("-1");
                     break;
                 }
             }

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

@@ -25,12 +25,17 @@ public class BEH0472 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() != null) {
-            Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            if (StringUtil.isBlank(beHospitalStructureMap.get("顺产(足月)"))
+        Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        if (beHospitalStructureMap != null) {
+            if (beHospitalStructureMap.get("性别") == null || beHospitalStructureMap.get("性别").contains("男")){
+                status.set("0"); //如果性别是男,就不报错
+                return;
+            }
+            boolean fertilitySituation = StringUtil.isBlank(beHospitalStructureMap.get("存活"))
+                    || StringUtil.isBlank(beHospitalStructureMap.get("顺产(足月)"))
                     || StringUtil.isBlank(beHospitalStructureMap.get("早产"))
-                    || StringUtil.isBlank(beHospitalStructureMap.get("流产"))
-                    || StringUtil.isBlank(beHospitalStructureMap.get("存活"))) {
+                    || StringUtil.isBlank(beHospitalStructureMap.get("流产"));
+            if (fertilitySituation) {
                 status.set("-1");
             }
         }

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

@@ -22,7 +22,7 @@ public class BEH0492 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getBeHospitalizedDoc() != null) {
             LisLabel lisLabel = inputInfo.getBeHospitalizedDoc().getLisLabel();
-            if (CatalogueUtil.isEmpty(lisLabel.getText())) {
+            if (lisLabel != null && CatalogueUtil.isEmpty(lisLabel.getText())) {
                 status.set("-1");
             }
         }