Explorar o código

义乌入院记录规则修改bug

hujing %!s(int64=4) %!d(string=hai) anos
pai
achega
5cd394099a

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

@@ -42,7 +42,7 @@ public class BEH0029 extends QCCatalogue {
             return;
         }
         String pastText = pastLabel.getText();
-        if (pastText.contains("详见原病历") || pastText.contains("预防接种")) {
+        if (pastText.contains("详见原病历") || pastText.contains("预防接种")) {
             status.set("0");
             return;
         }

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

@@ -37,7 +37,7 @@ public class BEH0044 extends QCCatalogue {
             return;
         }
         String personalText = personalLabel.getText();
-        if (personalText.contains("详见病历")) {
+        if (personalText.contains("详见病历") || personalText.contains("疫区")) {
             status.set("0");
             return;
         }

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

@@ -37,7 +37,7 @@ public class BEH0048 extends QCCatalogue {
             return;
         }
         String personalText = personalLabel.getText();
-        if (personalText.contains("详见原病历")) {
+        if (personalText.contains("详见原病历") || personalText.contains("放射物") || personalText.contains("粉尘")) {
             status.set("0");
             return;
         }

+ 5 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0050.java

@@ -19,21 +19,22 @@ public class BEH0050 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
         PersonalLabel personalLabel = inputInfo.getBeHospitalizedDoc().getPersonalLabel();
-        if (personalLabel == null){
+        if (personalLabel == null) {
             status.set("0");
             return;
         }
         String personalText = personalLabel.getText();
-        if (StringUtil.isNotBlank(personalText) && personalText.contains("偶有")){
+        if (StringUtil.isNotBlank(personalText) && personalText.contains("偶有")) {
             status.set("0");
             return;
         }
-        if (StringUtil.isNotBlank(personalText) && (personalText.contains("无吸烟史")|| personalText.contains("否认吸烟史"))){
+        if (StringUtil.isNotBlank(personalText) && (personalText.contains("无吸烟史") || personalText.contains("否认吸烟史"))
+                || personalText.contains("不吸烟")) {
             status.set("0");
             return;
         }