diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index c37d805..a48f440 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,7 +34,7 @@
             if (ToolUtil.isEmpty(deviceType)) {
                 deviceType = AlarmConstants.DEFAULT_DEVICE_TYPE;
             }
-            Map<String, Object> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
+        List<Map<String, Object>> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
             return ResponseData.success(res);
 
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index c37d805..a48f440 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,7 +34,7 @@
             if (ToolUtil.isEmpty(deviceType)) {
                 deviceType = AlarmConstants.DEFAULT_DEVICE_TYPE;
             }
-            Map<String, Object> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
+        List<Map<String, Object>> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
             return ResponseData.success(res);
 
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 24b5141..348ee64 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -26,5 +26,5 @@
      * @param endTime 结束时间
      * @return
      */
-    Map<String, Object> gasAlarmBySecondArea(String areaId, String startTime, String endTime,String deviceType);
+    List<Map<String, Object>> gasAlarmBySecondArea(String areaId, String startTime, String endTime,String deviceType);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index c37d805..a48f440 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,7 +34,7 @@
             if (ToolUtil.isEmpty(deviceType)) {
                 deviceType = AlarmConstants.DEFAULT_DEVICE_TYPE;
             }
-            Map<String, Object> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
+        List<Map<String, Object>> res = statisticsService.gasAlarmBySecondArea(areaId, startTime, endTime,deviceType);
             return ResponseData.success(res);
 
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 24b5141..348ee64 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -26,5 +26,5 @@
      * @param endTime 结束时间
      * @return
      */
-    Map<String, Object> gasAlarmBySecondArea(String areaId, String startTime, String endTime,String deviceType);
+    List<Map<String, Object>> gasAlarmBySecondArea(String areaId, String startTime, String endTime,String deviceType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index c95d886..2e77dc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -157,12 +157,13 @@
      * @return
      */
     @Override
-    public Map<String, Object> gasAlarmBySecondArea(String areaId, String startTime, String endTime, String deviceType) {
+    public List<Map<String, Object>> gasAlarmBySecondArea(String areaId, String startTime, String endTime, String deviceType) {
         EntityWrapper<Area> query = new EntityWrapper();
         query.eq("PID", areaId);
         List<Area> areas = areaService.selectList(query);
-        Map<String, Object> resMap = new HashMap<>();
+        List<Map<String, Object>> resMaps = new ArrayList<>();
         areas.stream().forEach(area -> {
+            Map<String, Object> resMap = new HashMap<>();
             // 二级区域报警数据
             resMap.put("areaId", area.getId());
             resMap.put("areaName", area.getAreaName());
@@ -172,8 +173,9 @@
             } else {
                 resMap.put("alarm", "0");
             }
+            resMaps.add(resMap);
         });
-        return resMap;
+        return resMaps;
     }
 
     @Override