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 51f9455..f0f4132 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
@@ -470,10 +470,15 @@ public class IotCommonP2ServiceImpl {
                 String newTimes = yesterMonth.format(monthdtf);
                 voSurvIntegrateParam.setStartTime(newTimes);
                 voSurvIntegrateParam.setEndTime(newTimes);
-                VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
-                LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
-                dataMap = processDataSub(yesterResult,nowItegrate.getSurvResult(),todayDataCounts,yesterDataCounts);
-                timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts,yesterData.getIndexs().size()));
+
+                int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
+
+                if(todayDataCounts < lastDayOfMonth) {
+                    VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
+                    LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
+                    dataMap = processDataSub(yesterResult,nowItegrate.getSurvResult(),todayDataCounts,yesterDataCounts);
+                    timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts,yesterData.getIndexs().size()));
+                }
             }
         } else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年
             if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月