更新

src/main/java/com/diagbot/enums/QualityContent.java

@@ -29,6 +29,7 @@ public class QualityContent {
      * 医嘱状态
      */
     public static final String EXECUTE_ORDER = "执行";
+    public static final String IN_USE = "在用";
     public static final String CANCELLATION_ORDER = "作废";
     /**
      * 医嘱判断相关

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -587,7 +587,7 @@ public class ConsoleFacade {
             QueryWrapper<DoctorAdvice> dtoQueryWrapper = new QueryWrapper<>();
             dtoQueryWrapper.eq("behospital_code",behospitalCode)
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("da_status",QualityContent.EXECUTE_ORDER);
+                    .eq("da_status",QualityContent.IN_USE);
             //查医嘱表
             List<DoctorAdvice> doctorAdvices = doctorAdviceFacade.getBaseMapper().selectList(dtoQueryWrapper);
             //手术病理
@@ -665,7 +665,6 @@ public class ConsoleFacade {
         }
         return false;
     }
-
     /**
      * 一级条件判断 或且
      * @param name
@@ -689,7 +688,28 @@ public class ConsoleFacade {
         }
         return false;
     }
-
+    /**
+     * 医嘱条件判断 且或
+     * @param name
+     * @param arg
+     * @return
+     */
+    public  Boolean condition(String name,String[][] arg){
+        int z=0;
+        for (int i = 0; i < arg.length; i++) {
+            String[] strings = arg[i];
+            for (int y = 0; y < strings.length; y++) {
+                if(name.contains(strings[y])){
+                    z++;
+                    continue;
+                }
+            }
+        }
+        if(z==arg.length){
+            return true;
+        }
+        return false;
+    }
 
     /**
      * 获取CT/MRI人数
@@ -720,7 +740,7 @@ public class ConsoleFacade {
         ArrayList<String> codeMri = new ArrayList<>();
         for (Map<String, String> MRINumMap : getDoctorAdviceNum) {
             String behospitalCodeMri = MRINumMap.get("behospital_code");
-                    if (!codeList.contains(behospitalCodeMri)) {
+                    if (!codeMri.contains(behospitalCodeMri)) {
                         String daItemName = MRINumMap.get("da_item_name");
                         if (StringUtil.isNotEmpty(daItemName)) {
                             String[][] mrList = QualityContent.MR_LIST;
@@ -729,19 +749,19 @@ public class ConsoleFacade {
                                 String[][] mrRegulation = QualityContent.MR_REGULATION;
                                 Boolean levelCondition = secondLevelCondition(daItemName, mrRegulation);
                                 if(levelCondition){
-                                    codeList.add(behospitalCodeMri);
+                                    codeMri.add(behospitalCodeMri);
                                     continue;
                                 }
                             }
                 }
             }
         }
-        if(ListUtil.isNotEmpty(codeList)){
+        if(ListUtil.isEmpty(codeList)){
             map.put("CT",Long.valueOf(0));
         }else {
             map.put("CT",Long.valueOf(codeList.size()));
         }
-        if(ListUtil.isNotEmpty(codeMri)){
+        if(ListUtil.isEmpty(codeMri)){
             map.put("MR",Long.valueOf(0));
         }else {
             map.put("MR",Long.valueOf(codeMri.size()));
@@ -762,7 +782,7 @@ public class ConsoleFacade {
                 QueryWrapper<DoctorAdvice> dtoQueryWrapper = new QueryWrapper<>();
                 dtoQueryWrapper.eq("behospital_code", behospitalCode)
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("da_status", QualityContent.EXECUTE_ORDER);
+                        .eq("da_status", QualityContent.IN_USE);
                 //查医嘱表
                 List<DoctorAdvice> doctorAdvices = doctorAdviceFacade.getBaseMapper().selectList(dtoQueryWrapper);
                 if (ListUtil.isNotEmpty(doctorAdvices) && doctorAdvices.size() > 0) {
@@ -806,7 +826,7 @@ public class ConsoleFacade {
                 QueryWrapper<DoctorAdvice> dtoQueryWrapper = new QueryWrapper<>();
                 dtoQueryWrapper.eq("behospital_code", behospitalCode)
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("da_status", QualityContent.EXECUTE_ORDER);
+                        .eq("da_status", QualityContent.IN_USE);
                 List<DoctorAdvice> doctorAdvices = doctorAdviceFacade.getBaseMapper().selectList(dtoQueryWrapper);
                 if(ListUtil.isNotEmpty(doctorAdvices)&&doctorAdvices.size()>0){
                     doc: