hujing пре 5 година
родитељ
комит
4adff929b0

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0073.java

@@ -30,7 +30,8 @@ public class BEH0073 extends QCCatalogue {
                     continue;
                 }
                 for (Diag diag : family.getDiags()) {
-                    if (diag.getName().contains("肝炎") || diag.getName().contains("结核")) {
+                    if (diag.getName().contains("肝炎") || diag.getName().contains("结核")
+                            || diag.getHospitalDiagName().contains("肝炎") || diag.getHospitalDiagName().contains("结核")) {
                         status = "0";
                         return;
                     }

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0074.java

@@ -28,7 +28,8 @@ public class BEH0074 extends QCCatalogue {
                     continue;
                 }
                 for (Diag diag : family.getDiags()) {
-                    if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")) {
+                    if (diag.getName().contains("癌") || diag.getName().contains("肿瘤")
+                            || diag.getHospitalDiagName().contains("癌") || diag.getHospitalDiagName().contains("肿瘤")) {
                         status = "0";
                         return;
                     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0079.java

@@ -17,7 +17,7 @@ public class BEH0079 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial() != null) {
-            if (CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial().getText())) {
+            if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial().getText())) {
                 status = "0";
             }
         }