diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
index f26a49b..4f2f5df 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
@@ -356,6 +356,8 @@ public class IotCommonP2ServiceImpl {
         }else if(IotConstants.month_days.equals(screenSummaryVo.getSummrayMode())){//月需要数据量
             LocalDate curDateMark = LocalDate.parse(startTime+"-01",daydtf);
             todayDataCounts = curDateMark.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
+        } else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())) {
+            todayDataCounts = 12;
         }
 
         if(IotConstants.day_hours.equals(screenSummaryVo.getSummrayMode())){//检查是否是今天
@@ -407,6 +409,9 @@ public class IotCommonP2ServiceImpl {
 
         timeList.addAll(nowItegrate.getIndexs().subList(0,todayDataCounts));
 
+        if(dataMap.isEmpty()){//如果非今日，传入第一次的统计
+            dataMap.putAll(nowItegrate.getSurvResult());
+        }
         voSurvIntegrateResult.setHeaders(nowItegrate.getHeaders());
         voSurvIntegrateResult.setSurvResult(dataMap);
         voSurvIntegrateResult.setIndexs(timeList);