Bläddra i källkod

台州质控修改逻辑及bug

hujing 5 år sedan
förälder
incheckning
bcbe83a508

+ 15 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0010.java

@@ -5,7 +5,7 @@ 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.label.ChiefLabel;
-import org.apache.commons.lang3.StringUtils;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -34,7 +34,17 @@ public class BEH0010 extends QCCatalogue {
             status.set("0");
             return;
         }
+        String chiefText = chiefLabel.getText();
+        if (StringUtil.isNotBlank(chiefText)) {
+            for (String word : containList) {
+                if (chiefText.contains(word)) {
+                    status.set("0");
+                    return;
+                }
+            }
+        }
         List<Diag> diags = chiefLabel.getDiags();
+        /*
         if (diags != null && diags.size() > 0) {
             Iterator<Diag> diagIterator = diags.iterator();
             while (diagIterator.hasNext()) {
@@ -48,13 +58,14 @@ public class BEH0010 extends QCCatalogue {
                 }
             }
         }
+         */
         if (diags != null && diags.size() > 0) {
             status.set("-1");
             for (Diag diag : diags) {
-                if (StringUtils.isEmpty(info.get())) {
-                    info.set(diag.getName());
+                if (StringUtil.isEmpty(info.get())) {
+                    info.set(diag.getHospitalDiagName());
                 } else {
-                    info.set(info.get() + "," + diag.getName());
+                    info.set(info.get() + "," + diag.getHospitalDiagName());
                 }
             }
         }