diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
index 999a90709e..a4e9ecbc6a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
@@ -84,6 +84,10 @@ public class TopicServiceImpl implements TopicService {
 
             }
 
+            if(!subGridOfAgency.containsKey(agency.getAgencyId())){
+                subGridOfAgency.put(agency.getAgencyId(),new HashSet<>());
+            }
+
         });
 
         return calculateAndSummarizeTopicStatisticalData(subGridOfAgency,agencies,gridGroupMap,targetDate,statusDimension,timeDimension,customerId);
@@ -324,13 +328,13 @@ public class TopicServiceImpl implements TopicService {
 
                         gridDistinct.put(gridId,true);
                 });
-                //机关-百分比
-                setAgencyTopicProportion(numberFormat,topicAgencyD_discussing,topicAgencyD_hidden,topicAgencyD_closed,totalAgencyD);
 
-                setAgencyDailyDataPacket(dataPacket,issueAgencyD,totalAgencyD,topicAgencyD_discussing,topicAgencyD_hidden,topicAgencyD_closed);
 
             }
+            //机关-百分比
+            setAgencyTopicProportion(numberFormat,topicAgencyD_discussing,topicAgencyD_hidden,topicAgencyD_closed,totalAgencyD);
 
+            setAgencyDailyDataPacket(dataPacket,issueAgencyD,totalAgencyD,topicAgencyD_discussing,topicAgencyD_hidden,topicAgencyD_closed);
         }
 
 
@@ -417,13 +421,14 @@ public class TopicServiceImpl implements TopicService {
 
                         gridDistinct.put(gridId,true);
                     });
-                    //机关-百分比
-                    setAgencyTopicMonthlyProportion(numberFormat,topicAgencyM_discussing,topicAgencyM_hidden,topicAgencyM_closed);
 
-                    setAgencyMonthlyDataPacket(dataPacket,issueAgencyM,topicAgencyM_discussing,topicAgencyM_hidden,topicAgencyM_closed);
+
 
                 }
+                //机关-百分比
+                setAgencyTopicMonthlyProportion(numberFormat,topicAgencyM_discussing,topicAgencyM_hidden,topicAgencyM_closed);
 
+                setAgencyMonthlyDataPacket(dataPacket,issueAgencyM,topicAgencyM_discussing,topicAgencyM_hidden,topicAgencyM_closed);
             }