修改大屏检验检测模块中间设备统计

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/JYJCDPStatisticsServiceImpl.java

@@ -537,9 +537,12 @@ public class JYJCDPStatisticsServiceImpl {
             return result;
         }
         // 1.气瓶统计
-        long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode,true, true, false);
+        long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode,true, false, false);
         // 2.8大类统计
-        stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,true, false);
+        stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,false, false);
+        // 单独计算已纳管设备（台套）数量总数
+        long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
+        result.put("total", hasSupervisoryCodeEquipCount);
         // 3.压力管道统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
         // 4.报检数量统计