Browse Source

修改医嘱二级条件判断

zhanghang 4 years ago
parent
commit
026cf6b47e
1 changed files with 6 additions and 5 deletions
  1. 6 5
      src/main/java/com/diagbot/facade/ConsoleFacade.java

+ 6 - 5
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -647,12 +647,12 @@ public class ConsoleFacade {
                 }
             }
             if(z==strings.length){
-                continue;
+                return  false;
             }else {
-               return true;
+               continue;
             }
         }
-        return false;
+        return true;
     }
     /**
      * 一级条件判断 或且
@@ -774,14 +774,15 @@ public class ConsoleFacade {
                                         String[][] mrList = QualityContent.MR_LIST;
                                         Boolean stair = stairCondition(daItemName, mrList);
                                         if (stair) {
-                                            String[][] ctRegulation = QualityContent.MR_REGULATION;
-                                            Boolean levelCondition = secondLevelCondition(daItemName, ctRegulation);
+                                            String[][] mrRegulation = QualityContent.MR_REGULATION;
+                                            Boolean levelCondition = secondLevelCondition(daItemName, mrRegulation);
                                             if (levelCondition) {
                                                 MRBehospitalCode.add(behospitalCode);
                                             }
                                         }
                                     }
                                 }
+
                             }
                         }
                         //获取为长期医嘱或临时医嘱的医嘱