Browse Source

修改逻辑及bug

hujing 5 years atrás
parent
commit
956f218dfd

+ 5 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0006.java

@@ -31,13 +31,15 @@ public class BEH0006 extends QCCatalogue {
             return;
         }
         String chiefText = chiefLabel.getText();
-        if (StringUtil.isNotBlank(chiefText) && (chiefText.contains("复查")
-                || chiefText.contains("检查") || chiefText.contains("术后") || chiefText.contains("药物")
-                || chiefText.contains("发现") || chiefText.contains("半年"))) {
+        if (StringUtil.isNotBlank(chiefText) && chiefText.contains("半年")) {
             status.set("0");
         } else {
             List<PD> pds = chiefLabel.getPds();
             if (pds != null && pds.size() > 0) {
+                if (pds.size() == 2) {
+                    status.set("0");
+                    return;
+                }
                 for (PD pd : pds) {
                     String pdName = pd.getName();
                     if (!CatalogueUtil.isEmpty(pdName)) {

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

@@ -53,7 +53,9 @@ public class BEH0014 extends QCCatalogue {
             if (present.length() > 30) {
                 present = present.substring(0, 30);
             }
-            if (present.contains("体检") || present.contains("发现") || present.contains("检查") || present.contains("因")) {
+            if (present.contains("体检") || present.contains("发现") || present.contains("检查") || present.contains("因")
+                    || present.contains("确诊") || present.contains("诊断") || present.contains("复查") || present.contains("术后")
+                    || present.contains("药物")) {
                 status.set("0");
                 return;
             }