修改大屏监督管理模块中间设备统计

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

@@ -1764,9 +1764,12 @@ public class JGDPStatisticsServiceImpl {
             return new HashMap<>();
         }
         // 0.气瓶数量统计
-        long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode, true, true, false);
+        long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode, true, false, false);
         // 1.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);
         // 2.压力管道长度统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
         // 3.已纳管设备总数