refactor: 优化设备状态统计逻辑并调整结果存储方式

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

@@ -965,7 +965,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         sum.put("name", "设备总数（台套）");
         sum.put("value", totle);
         statics.add(sum);
-        getEquipStatusStatic(boolMust, builder, statics);
+
+        List<Map<String, Object>> equipStatusMap = new ArrayList<>();
+        getEquipStatusStatic(boolMust, builder, equipStatusMap);
+        result.put("inspectStatus",equipStatusMap);
+
         if (ObjectUtils.isEmpty(filterParams) || !filterParams.containsKey("EQU_LIST")) {
             filterParams = new JSONObject();
             JSONArray jsonArray = new JSONArray();
@@ -1032,9 +1036,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             tyMap.put("value", ty);
             otherMap.put("name", "其他");
             otherMap.put("value", other);
-            statics.add(zyMap);
-            statics.add(tyMap);
-            statics.add(otherMap);
+         statics.add(zyMap);
+         statics.add(tyMap);
+         statics.add(otherMap);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }