大屏压力容器统计列表去除气瓶数据，气瓶单独统计

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
+import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
@@ -898,9 +899,12 @@ public class ZLDPStatisticsServiceImpl {
         }
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            if ("2300".equals(map.getString("EQU_LIST_CODE"))) {
+            if (CylinderTypeEnum.CYLINDER.getCode().equals(map.getString("EQU_LIST_CODE"))) {
                 meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
-            } else {
+            } else if(EquipmentClassifityEnum.YLRQ.getCode().equals(map.getString("EQU_LIST_CODE"))){
+                meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
+                meBuilder.mustNot(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", CylinderTypeEnum.CYLINDER.getCode()));
+            }else {
                 meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
             }
             boolMust.must(meBuilder);