diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 359b5591..01eece8a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -962,16 +962,16 @@ union all
                  gr.name as orgName,
                  gr.pid as parentId,
                 'grid' as orgType,
-                 IFNULL(t.publishIssueSum,0) AS publishIssueTotal, -- 党员发布的议题总数
-                 IFNULL(t.issueTotal,0) AS issueTotal, -- 议事总数
-                 IFNULL(t.topicTotal,0) AS topicTotal, -- 话题总数
-                 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal, -- 议题转项目数
-                 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(publishIssueTotal/issueTotal,4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 IFNULL(t.publishIssueSum,0) AS publishIssueTotal,
+                 IFNULL(t.issueTotal,0) AS issueTotal,
+                 IFNULL(t.topicTotal,0) AS topicTotal,
+                 IFNULL(t.shiftProjectTotal,0) AS shiftProjectTotal,
+                 IFNULL(t.resolvedProjectTotal,0) AS resolvedProjectTotal,
+                 IFNULL(format(round(publishIssueTotal/issueTotal,4)*100,2),0.00) as issueRatio,
+                 IFNULL(format(round(publishTopicTotal/topicTotal,4)*100,2),0.00) as topicRatio,
+                 IFNULL(format(round(publishShiftProjectTotal/shiftProjectTotal,4)*100,2),0.00) as shiftProjectRatio,
+                 IFNULL(format(round(publishResolvedProjectTotal/resolvedProjectTotal,4)*100,2),0.00) as resolvedProjectRatio,
+                 IFNULL(format(round(publishIssueSum/issueSum,4)*100,2),0.00) as publishIssueRatio,
                  DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime,
                  IFNULL(issueTotal,0) AS issueRatioFm,
                  IFNULL(topicTotal,0) AS topicRatioFm,
@@ -981,16 +981,16 @@ union all
     FROM esua_epdc_admin.sys_dept gr
     left join
         (select  total.GRID_ID,
-                         sum(total.issueSum) as issueSum, -- 议题总数
-                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-                         sum(total.issueTotal) as issueTotal, -- 议事总数
-                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-                         sum(total.topicTotal) as topicTotal, -- 话题总数
-                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
+                         sum(total.issueSum) as issueSum,
+                         sum(total.publishIssueSum) as publishIssueSum,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.publishIssueTotal) as publishIssueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.publishTopicTotal) as publishTopicTotal,
+                         sum(total.shiftProjectTotal) as shiftProjectTotal,
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal,
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal,
+                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal
             from
             (select GRID_ID,
                             sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
@@ -1062,16 +1062,16 @@ UNION ALL
                  co.name as orgName,
                  co.pid as parentId,
                 'agency' as orgType,
-                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal, -- 党员发布的议题总数
-                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal, -- 议事总数
-                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal, -- 话题总数
-                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal, -- 议题转项目数
-                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal,
+                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal,
+                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal,
+                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal,
+                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal,
+                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio,
                  DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime,
                  IFNULL(publishIssueTotal,0) AS issueRatioFm,
                  IFNULL(publishTopicTotal,0) AS topicRatioFm,
@@ -1082,16 +1082,16 @@ UNION ALL
     LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
     left join
         (select  total.GRID_ID,
-                         sum(total.issueSum) as issueSum, -- 议题总数
-                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-                         sum(total.issueTotal) as issueTotal, -- 议事总数
-                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-                         sum(total.topicTotal) as topicTotal, -- 话题总数
-                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
+                         sum(total.issueSum) as issueSum,
+                         sum(total.publishIssueSum) as publishIssueSum,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.publishIssueTotal) as publishIssueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.publishTopicTotal) as publishTopicTotal,
+                         sum(total.shiftProjectTotal) as shiftProjectTotal,
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal,
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal,
+                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal
             from
             (select GRID_ID,
                             sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,
@@ -1164,16 +1164,16 @@ union all
                  st.name as orgName,
                  st.pid as parentId,
                 'agency' as orgType,
-                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal, -- 党员发布的议题总数
-                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal, -- 议事总数
-                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal, -- 话题总数
-                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal, -- 议题转项目数
-                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal, -- 已解决项目总数
-                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio, -- 议事占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio, -- 话题占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio, -- 议题转项目占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio, -- 解决项目占比(党员/用户)
-                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio, -- 党员发布议题占比(党员/用户)
+                 SUM(IFNULL(t.publishIssueSum,0)) AS publishIssueTotal,
+                 SUM(IFNULL(t.publishIssueTotal,0)) AS issueTotal,
+                 SUM(IFNULL(t.publishTopicTotal,0)) AS topicTotal,
+                 SUM(IFNULL(t.shiftProjectTotal,0)) AS shiftProjectTotal,
+                 SUM(IFNULL(t.resolvedProjectTotal,0)) AS resolvedProjectTotal,
+                 IFNULL(format(round(SUM(IFNULL(publishIssueTotal,0))/SUM(IFNULL(issueTotal,0)),4)*100,2),0.00) as issueRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishTopicTotal,0))/SUM(IFNULL(topicTotal,0)),4)*100,2),0.00) as topicRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishShiftProjectTotal,0))/SUM(IFNULL(shiftProjectTotal,0)),4)*100,2),0.00) as shiftProjectRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishResolvedProjectTotal,0))/SUM(IFNULL(resolvedProjectTotal,0)),4)*100,2),0.00) as resolvedProjectRatio,
+                 IFNULL(format(round(SUM(IFNULL(publishIssueSum,0))/SUM(IFNULL(issueSum,0)),4)*100,2),0.00) as publishIssueRatio,
                  DATE_FORMAT(date_add( now( ), INTERVAL - 1 day),'%Y%m%d') as dataEndTime,
                  IFNULL(publishIssueTotal,0) AS issueRatioFm,
                  IFNULL(publishTopicTotal,0) AS topicRatioFm,
@@ -1185,16 +1185,16 @@ union all
     LEFT JOIN esua_epdc_admin.sys_dept gr on co.id=gr.pid
     left join
         (select  total.GRID_ID,
-                         sum(total.issueSum) as issueSum, -- 议题总数
-                         sum(total.publishIssueSum) as publishIssueSum,-- 党员发布的议题总数
-                         sum(total.issueTotal) as issueTotal, -- 议事总数
-                         sum(total.publishIssueTotal) as publishIssueTotal, -- 党员发布的议事总数
-                         sum(total.topicTotal) as topicTotal, -- 话题总数
-                         sum(total.publishTopicTotal) as publishTopicTotal, -- 党员发布的话题总数
-                         sum(total.shiftProjectTotal) as shiftProjectTotal, -- 议题转项目数
-                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal, -- 党员议题转项目数
-                         sum(total.resolvedProjectTotal) as resolvedProjectTotal, -- 已解决项目总数
-                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal -- 党员已解决项目总数
+                         sum(total.issueSum) as issueSum,
+                         sum(total.publishIssueSum) as publishIssueSum,
+                         sum(total.issueTotal) as issueTotal,
+                         sum(total.publishIssueTotal) as publishIssueTotal,
+                         sum(total.topicTotal) as topicTotal,
+                         sum(total.publishTopicTotal) as publishTopicTotal,
+                         sum(total.shiftProjectTotal) as shiftProjectTotal,
+                         sum(total.publishShiftProjectTotal) as publishShiftProjectTotal,
+                         sum(total.resolvedProjectTotal) as resolvedProjectTotal,
+                         sum(total.publishResolvedProjectTotal) as publishResolvedProjectTotal
             from
             (select GRID_ID,
                             sum(USER_PUBLISH_TIMES+PARTY_PUBLISH_TIMES) as issueSum,