diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
index 16b32d5..1fd6560 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvAlertRecordServiceImpl.java
@@ -60,6 +60,11 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
     @Override
     public AlertSummaryVo getSummary(AlertSummaryDTO alertSummaryDTO) {
         AlertSummaryVo alertSummaryVo = new AlertSummaryVo();
+        Map<String,SurvItemInfo> itemInfo = new HashMap<>();
+        List<SurvItemInfo> itemList = new ArrayList<>();
+        List<String> timeList = new ArrayList<>();
+        Map<String,List<String>> dataMap = new HashMap<>();
+
        if(StringUtils.isNotBlank(alertSummaryDTO.getStationCode())){
            //获取站点下的所有设备
            List<String> deployTypes = new ArrayList<>();
@@ -74,8 +79,17 @@ public class SurvAlertRecordServiceImpl extends ServiceImpl<SurvAlertRecordMappe
            if(deviceList!=null && !deviceList.isEmpty()){
                for (SurvDeviceDeploy deploy : deviceList) {
                    alertSummaryDTO.setDeployId(deploy.getId());
-                   alertSummaryVo = getDeviceSummary(alertSummaryDTO);
+                   AlertSummaryVo  temp = getDeviceSummary(alertSummaryDTO);
+                   itemInfo.putAll(temp.getItemInfo());
+                   itemList.addAll(temp.getItemList());
+                   dataMap.putAll(temp.getDataMap());
+
+                   timeList = temp.getTimeList();
                }
+               alertSummaryVo.setItemInfo(itemInfo);
+               alertSummaryVo.setItemList(itemList);
+               alertSummaryVo.setDataMap(dataMap);
+               alertSummaryVo.setTimeList(timeList);
            }
 
        }else{