更新

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

@@ -25,7 +25,7 @@ public class QualityContent {
     /**
      * 关联首页无code需要去医嘱查询指标
      */
-    public static List<String> NORecord_NEED_MEDICAL_ADVICE = Arrays.asList("全部",
+    public static List<String> NORecord_NEED_MEDICAL_ADVICE = Arrays.asList("",
             "手术记录24小时内完成率","病理检查记录符合率","抗菌药物使用记录符合率"
     );
     /**

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

@@ -423,7 +423,7 @@ public class ConsoleFacade {
             if(QualityContent.NO_MEDICAL_ADVICE.contains(indexName)){
                 //入院记录24小时完成率
                 //入院记录完成人数为
-                if(indexName.equals(QualityContent.RYJL_24H_WCL)||indexName.equals(QualityContent.QB)) {
+                if(indexName.equals(QualityContent.RYJL_24H_WCL)||indexName!=null) {
                     if (InHospitalRecords != null && startCount != null) {
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.RYJL_24H_WCL);
@@ -434,7 +434,7 @@ public class ConsoleFacade {
                 }
                 //出院记录24小时完成率
                 //出院记录完成人数为
-                if(indexName.equals(QualityContent.CYJL_24H_WCL)||indexName.equals(QualityContent.QB)) {
+                if(indexName.equals(QualityContent.CYJL_24H_WCL)||indexName!=null) {
                     if (OutHospitalRecords != null && startCount != null) {
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.CYJL_24H_WCL);
@@ -445,7 +445,7 @@ public class ConsoleFacade {
                 }
                 //病案首页24小时完成率
                 //病案首页完成人数为
-                if(indexName.equals(QualityContent.BASY_24H_WCL)||indexName.equals(QualityContent.QB)) {
+                if(indexName.equals(QualityContent.BASY_24H_WCL)||indexName!=null) {
                     if (recordHomePage != null && startCount != null) {
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.BASY_24H_WCL);
@@ -481,7 +481,7 @@ public class ConsoleFacade {
                 Long chemotherapyMalignantTumorsNum = adviceNum.get("chemotherapyMalignantTumors");
                 //手术记录完成率
                 //手术完成人数为
-                if (indexName.equals(QualityContent.SSJL_24H_WCL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.SSJL_24H_WCL)||indexName!=null) {
                     if (operationFeeNum != null && operationCount != null) {
                         LinkedHashMap<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.SSJL_24H_WCL);
@@ -491,7 +491,7 @@ public class ConsoleFacade {
                     }
                 }
                 //CT完成率
-                if (indexName.equals(QualityContent.CT_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.CT_JCJL_FHL)||indexName!=null) {
                     if (CTNum != null && ct != null) {
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.CT_JCJL_FHL);
@@ -501,7 +501,7 @@ public class ConsoleFacade {
                     }
                 }
                 //MRI完成率
-                if (indexName.equals(QualityContent.MR_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.MR_JCJL_FHL)||indexName!=null) {
                     if (MRNum != null && mr != null) {
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
                         stringStringHashMap.put("name", QualityContent.MR_JCJL_FHL);
@@ -510,7 +510,7 @@ public class ConsoleFacade {
                         hashMapArrayList.add(stringStringHashMap);
                     }
                 }
-                if (indexName.equals(QualityContent.BL_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.BL_JCJL_FHL)||indexName!=null) {
                     if (operationPathologyFeeNum != null && operationPathologyFee != null) {
                         //病理完成率为
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
@@ -520,7 +520,7 @@ public class ConsoleFacade {
                         hashMapArrayList.add(stringStringHashMap);
                     }
                 }
-                if (indexName.equals(QualityContent.KJYW_SY_FHL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.KJYW_SY_FHL)||indexName!=null) {
                     if (antibiosisFeeNum != null && antibiosis != null) {
                         //抗菌
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
@@ -530,7 +530,7 @@ public class ConsoleFacade {
                         hashMapArrayList.add(stringStringHashMap);
                     }
                 }
-                if (indexName.equals(QualityContent.EXZL_HXZL_FHL)||indexName.equals(QualityContent.QB)) {
+                if (indexName.equals(QualityContent.EXZL_HXZL_FHL)||indexName!=null) {
                     if (chemotherapyMalignantTumorsNum != null && chemotherapyMalignantTumors != null) {
                         //恶性肿瘤化学治疗
                         Map<String, String> stringStringHashMap = new LinkedHashMap<>();
@@ -541,9 +541,6 @@ public class ConsoleFacade {
                     }
                 }
             }
-
-        //细菌培养
-        Long bacterialCulture = triggeringRulesMap.get("bacterialCulture");
         /**
          * =================================标示线========================================
          */
@@ -715,7 +712,7 @@ public class ConsoleFacade {
                         if (behospitalCodeList.contains(behospitalCode)) {
                             //code也不存在于以保存的code集合
                             //手术
-                            if(indexName.equals(QualityContent.SSJL_24H_WCL)||indexName.equals(QualityContent.BL_JCJL_FHL)||indexName.equals(QualityContent.QB)){
+                            if(indexName.equals(QualityContent.SSJL_24H_WCL)||indexName.equals(QualityContent.BL_JCJL_FHL)||indexName!=null){
                             if (!operationBehospitalCode.contains(behospitalCode)) {
                                 String[][] operationList = QualityContent.OPERATION_LIST;
                                 Boolean stair = stairCondition(daItemName, operationList);
@@ -729,7 +726,7 @@ public class ConsoleFacade {
                             }
                             }
                             //手术病理
-                            if(indexName.equals(QualityContent.BL_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                            if(indexName.equals(QualityContent.BL_JCJL_FHL)||indexName!=null) {
                                 if (!pathologyBehospitalCode.contains(behospitalCode)) {
                                     Boolean condition = stairCondition(daItemName, QualityContent.BL_LIST);
                                     if (condition) {
@@ -740,7 +737,7 @@ public class ConsoleFacade {
                             //取临时和长期
                             if (doctorAdviceType.equals(QualityContent.STAT_ORDER) || doctorAdviceType.equals(QualityContent.STANDING_ORDER)) {
                                 //抗菌药物
-                                if(indexName.equals(QualityContent.KJYW_SY_FHL)||indexName.equals(QualityContent.QB)) {
+                                if(indexName.equals(QualityContent.KJYW_SY_FHL)||indexName!=null) {
                                     if (!antibiosisBehospitalCode.contains(behospitalCode)) {
                                         List<String> antimicrobialDrugList = QualityContent.Antimicrobial_Drug_List;
                                         for (String antimicrobialDrug : antimicrobialDrugList) {
@@ -757,7 +754,7 @@ public class ConsoleFacade {
                         //得到为临时医嘱
                         if (StringUtil.isNotEmpty(doctorAdviceType)) {
                             if (doctorAdviceType.equals(QualityContent.STAT_ORDER)) {
-                                if(indexName.equals(QualityContent.CT_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                                if(indexName.equals(QualityContent.CT_JCJL_FHL)||indexName!=null) {
                                     if (!CTBehospitalCode.contains(behospitalCode)) {
                                         //筛选与CT相关
                                         //一级条件
@@ -773,7 +770,7 @@ public class ConsoleFacade {
                                     }
                                 }
                                 //与MR相关
-                                if(indexName.equals(QualityContent.MR_JCJL_FHL)||indexName.equals(QualityContent.QB)) {
+                                if(indexName.equals(QualityContent.MR_JCJL_FHL)||indexName!=null) {
                                     if (!MRBehospitalCode.contains(behospitalCode)) {
                                         String[][] mrList = QualityContent.MR_LIST;
                                         Boolean stair = stairCondition(daItemName, mrList);
@@ -788,9 +785,9 @@ public class ConsoleFacade {
                                 }
                             }
                         }
-                    //获取为长期医嘱或临时医嘱的医嘱
+                  /*  //获取为长期医嘱或临时医嘱的医嘱
                     if(StringUtil.isNotEmpty(doctorAdviceType)) {
-                        if (indexName.equals(QualityContent.EXZL_HXZL_FHL)||indexName.equals(QualityContent.QB)) {
+                        if (indexName.equals(QualityContent.EXZL_HXZL_FHL)||indexName!=null) {
                             if (ListUtil.isNotEmpty(malignancyCodeList)) {
                                 if (malignancyCodeList.contains(behospitalCode)) {
                                     if (!chemotherapyMalignantTumorsBehospitalCode.contains(behospitalCode)) {
@@ -807,7 +804,7 @@ public class ConsoleFacade {
                                 }
                             }
                         }
-                    }
+                    }*/
                 }
         })).get();
         } catch (InterruptedException e) {
@@ -852,6 +849,7 @@ public class ConsoleFacade {
             }else {
                 map.put("chemotherapyMalignantTumors",Long.valueOf(chemotherapyMalignantTumorsBehospitalCode.size()));
             }
+
             return map;
         }
     }