逻辑修改

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

@@ -92,21 +92,17 @@ public class QualityContent {
      * 抢救药物  维护修改
      */
 
-    public static List<String> Rescue_Drug_List = Arrays.asList(
+    public static List<String> RESCUEDRUGLIST = Arrays.asList(
             "尼可刹米","可拉明","盐酸洛贝林","山梗菜碱","肾上腺素","阿拉明", "重酒石酸间羟胺", "多巴胺", "利血平", "25%硫酸镁注射液", "垂体后叶素","注射用血凝酶", "阿托品","氯解磷定注射液","盐酸纳洛酮","异丙嗪", "非那更","地西泮", "安定","20%甘露醇");
-    public static List<String> getRescue_Drug_List() {
-        return Rescue_Drug_List;
-    }
+
 
     /**
      *   临床用血
      */
-    public static List<String> blood_List = Arrays.asList(
-            "交叉配血");
+    public static List<String> BLOODLIST = Arrays.asList(
+            "交叉配血","血交叉");
+
 
-    public static List<String> getBlood_List() {
-        return blood_List;
-    }
 }
 
 

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

@@ -518,6 +518,7 @@ public class ConsoleFacade {
         //指标十七 医师查房记录
                                   retLists = WardRoundMethod(retLists, baseIndex, triggeringRulesMap);
         //指标十八 抢救记录
+        filterVO.setFlagStr("0");
         List<MedManageParamsDTO> medManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
                                   retLists = rescueMethod(medManageParams,retLists,triggeringRulesMap);
         //指标十九 出院患者病历2日归档
@@ -2680,13 +2681,13 @@ public class ConsoleFacade {
     //指标十八 抢救记录
     private  List<Map<String, String>> rescueMethod(List<MedManageParamsDTO> medManageParams, List<Map<String, String>> retList,Map<String, Long> triggeringRulesMap){
         List<MedManageParamsDTO> manageList= new ArrayList<>();
+        List<String> rescueDrugList = QualityContent.RESCUEDRUGLIST;
         for (int i = 0; i < medManageParams.size(); i++) {
-            List<String> rescueDrugList = QualityContent.getRescue_Drug_List();
+            String daItemName = medManageParams.get(i).getDaItemName();
             String doctorAdviceType = medManageParams.get(i).getDoctorAdviceType();
             String da_status = medManageParams.get(i).getDa_status();
             for (String str : rescueDrugList) {
-                String daItemName = medManageParams.get(i).getDaItemName();
-                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)){
+                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && (da_status == null || (StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)))){
                     manageList.add(medManageParams.get(i));
                 }
             }
@@ -2740,14 +2741,14 @@ public class ConsoleFacade {
     //指标十六  临床用血相关记录符合率
     private  List<Map<String, String>> bloodMethod( List<Map<String, String>>retList,  List<MedManageParamsDTO> medManageParams, Map<String, Long> triggeringRulesMap){
         List<MedManageParamsDTO> manageList= new ArrayList<>();
+        List<String> blood_list = QualityContent.BLOODLIST;
         for (MedManageParamsDTO medManageParam : medManageParams) {
-            List<String> blood_list = QualityContent.getBlood_List();
             String doctorAdviceType = medManageParam.getDoctorAdviceType();
             String da_status = medManageParam.getDa_status();
             String daItemName = medManageParam.getDaItemName();
             String repName = medManageParam.getRepName();
             for (String str : blood_list) {
-                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(repName) && repName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && StringUtils.isNotEmpty(da_status) && ! da_status.equals(QualityContent.CANCELLATION_ORDER)){
+                if(StringUtils.isNotEmpty(daItemName) && daItemName.equals(str) && StringUtils.isNotEmpty(repName) && repName.equals(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && (da_status == null || (StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)))){
                     manageList.add(medManageParam);
                 }
             }

src/main/java/com/diagbot/web/ConsoleController.java

@@ -448,7 +448,7 @@ public class ConsoleController {
     @ApiOperation(value = "病案首页合格率占比[by:zhaops]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "level： 病历等级 <br>" +
-                    "name： 科室名称 <br>" +
+                    "deptName： 科室名称 <br>" +
                     "asc： 排序（升序） <br>" +
                     "desc： 排序（降序） <br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")