Browse Source

既往史输入空格现病史未填写不提示消息

wangsy 4 years ago
parent
commit
2d260bfd8a

+ 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("诱因")) {
                 return;

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

@@ -49,7 +49,8 @@ public class BEH0014 extends QCCatalogue {
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().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()))) {
             status.set("0");
             return;
         }
@@ -64,10 +65,6 @@ public class BEH0014 extends QCCatalogue {
         }
         //硬规则匹配 前30个字有"体检"或"发现"或"检查"(containList)字样
         String present = presentLabel.getText();
-        if("。".equals(present)){
-            status.set("0");
-            return;
-        }
         if (StringUtils.isNotEmpty(present)) {
             if (present.length() > 30) {
                 present = present.substring(0, 30);