Explorar o código

既往史和现病史输入空格不提示消息

wangsy %!s(int64=4) %!d(string=hai) anos
pai
achega
40c6879095

+ 2 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0013.java

@@ -32,13 +32,11 @@ public class BEH0013 extends QCCatalogue {
         PresentLabel presentLabel = beHospitalizedDoc.getPresentLabel();
         //既往史
         PastLabel pastLabel = beHospitalizedDoc.getPastLabel();
-        if ((presentLabel == null || StringUtil.isBlank(presentLabel.getText())) && StringUtil.isBlank(pastLabel.getText())) {
+        if ((presentLabel == null || StringUtil.isBlank(presentLabel.getText()) || "。".equals(presentLabel.getText()))
+                && (StringUtil.isBlank(pastLabel.getText()) || "。".equals(pastLabel.getText()))) {
             return;
         }
         String text = presentLabel.getText();
-        if ("。".equals(text)) {
-            return;
-        }
         if (StringUtil.isNotBlank(text)) {
             if ((text.contains("无") || text.contains("否认") || text.contains("内固定")) && !text.contains("诱因")) {
                 return;

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Cause;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Diag;
+import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -44,7 +45,10 @@ public class BEH0014 extends QCCatalogue {
             }
         }*/
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
-        if (presentLabel == null) {
+        //既往史
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if ((presentLabel == null || StringUtil.isBlank(presentLabel.getText()) || "。".equals(presentLabel.getText()))
+                && (StringUtil.isBlank(pastLabel.getText()) || "。".equals(pastLabel.getText()))) {
             status.set("0");
             return;
         }