diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
index f91b88b..ac2f6f7 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenBaseReportDao.xml
@@ -1271,8 +1271,8 @@
             resultType="com.elink.esua.epdc.dto.screen.result.GridTopicStatusResultDTO">
 
 
- select t.*,
-        #{customId}                                                                                          as customerId,
+        select t.*,
+        #{customId}                                                                                            as customerId,
         DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
         CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
         'W',
@@ -1291,11 +1291,12 @@
         grid.id                                                                                               as gridId,
         'discussi'                                                                                            as topicStatusId,
         count(et.STATE = 0 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
+        ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+        ifnull(count(et.STATE = 0
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)  as topicIncrement
 
         from esua_epdc_admin.sys_dept grid
-        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        left join esua_epdc_group.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
         and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where grid.del_flag = '0'
         and grid.type_key = 'grid_party'
@@ -1303,16 +1304,13 @@
         group by grid.id
 
         union  all
-        select
-        grid.pid                                                                                              as agencyId,
-        grid.id                                                                                               as gridId,
-        'hidden'                                                                                            as topicStatusId,
-        count(et.SHIELD_FLAG = 1 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)
+        select grid.pid as agencyId,
+        grid.id  as gridId,
+        'hidden' as topicStatusId,
+        0        as topicCount,
+        0        as topicProportion,
+        0        as topicIncrement
         from esua_epdc_admin.sys_dept grid
-        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
-        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where grid.del_flag = '0'
         and grid.type_key = 'grid_party'
         and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
@@ -1326,26 +1324,24 @@
         grid.id                                                                                               as gridId,
         'closed'                                                                                            as topicStatusId,
         count(et.STATE = 20 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                   as topicIncrement
-
+        ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+        ifnull(count(et.STATE = 20
+         and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)         as topicIncrement
         from esua_epdc_admin.sys_dept grid
-        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        left join esua_epdc_group.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
         and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where grid.del_flag = '0'
         and grid.type_key = 'grid_party'
         and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         group by grid.id
         )t
-
     </select>
     <select id="selectCommunityTopicStatusList"
             resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicStatusResultDTO">
 
 
-
         select t.*,
-              #{customId}                                                                                                   as customerId,
+        #{customId}                                                                                                   as customerId,
         DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
         CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
         'W',
@@ -1358,73 +1354,68 @@
         DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId
         from
         (
-
         select
-            community.id                                                                                              as agencyId,
-            community.pid                                                                                               as pid,
-            'discussi'                                                                                            as topicStatusId,
-            count(et.STATE = 0 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.STATE = 0 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
-            from esua_epdc_admin.sys_dept grid
-            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
-            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
-            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
-            where grid.del_flag = '0'
-            and grid.type_key = 'grid_party'
-            and community.del_flag = '0'
-            and community.type_key = 'community_party'
-            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            group by community.id
-
+        community.id                                                                                              as agencyId,
+        community.pid                                                                                               as pid,
+        'discussi'                                                                                            as topicStatusId,
+        count(et.STATE = 0 or null)                                                                                          as topicCount,
+        ifnull(round(ifnull(count(et.STATE = 0 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+        ifnull(count(et.STATE = 0
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)     as topicIncrement
 
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        left join `esua_epdc_group`.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;=  DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by community.id
 
         union all
 
-
-        select
-            community.id                                                                                              as agencyId,
-            community.pid                                                                                               as pid,
-            'hidden'                                                                                            as topicStatusId,
-            count(et.SHIELD_FLAG = 1 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.SHIELD_FLAG = 1 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.SHIELD_FLAG = 1 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
-            from esua_epdc_admin.sys_dept grid
-            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
-            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
-            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
-            where grid.del_flag = '0'
-            and grid.type_key = 'grid_party'
-            and community.del_flag = '0'
-            and community.type_key = 'community_party'
-            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            group by community.id
+        select community.id  as agencyId,
+        community.pid as pid,
+        'hidden'      as topicStatusId,
+        0             as topicCount,
+        0             as topicProportion,
+        0             as topicIncrement
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        where  grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by community.id
 
         union all
 
 
         select
-            community.id                                                                                              as agencyId,
-            community.pid                                                                                               as pid,
-            'closed'                                                                                            as topicStatusId,
-            count(et.STATE = 20 or null)                                                                                          as topicCount,
-            ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
-            ifnull(count(et.STATE = 20 and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)                                                                     as topicIncrement
-            from esua_epdc_admin.sys_dept grid
-            left join esua_epdc_admin.sys_dept community on grid.pid = community.id
-            left join `esua_epdc_party_group`.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
-            and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
-            where grid.del_flag = '0'
-            and grid.type_key = 'grid_party'
-            and community.del_flag = '0'
-            and community.type_key = 'community_party'
-            and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-            group by community.id
+        community.id                                                                                              as agencyId,
+        community.pid                                                                                               as pid,
+        'closed'                                                                                            as topicStatusId,
+        count(et.STATE = 20 or null)                                                                                          as topicCount,
+        ifnull(round(ifnull(count(et.STATE = 20 or null), 0) / ifnull(count(et.ID), 0),2),0)  as topicProportion,
+        ifnull(count(et.STATE = 20
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null),0)  as topicIncrement
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        left join `esua_epdc_group`.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;=  DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
+        and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        group by community.id
 
-        )t;
+        )t
     </select>
     <select id="selectGridTopicIssueList"
             resultType="com.elink.esua.epdc.dto.screen.result.GridTopicIssueResultDTO">
@@ -1443,11 +1434,12 @@
         DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
         grid.pid                                                                                              as agencyId,
         grid.id                                                                                               as gridId,
-        ifnull(count(et.ID),0)                                                                                         as issueTotal,
-        ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issueIncr
+        ifnull(count(ei.ID),0)                                                                                         as issueTotal,
+        ifnull((count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issueIncr
         from esua_epdc_admin.sys_dept grid
-        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.PARTY_MEMBER = '1'
-        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        left join esua_epdc_group.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.STATE = '10'
+        left join esua_epdc_events.epdc_issue ei on ei.ID = et.ISSUE_ID and ei.DEL_FLAG = '0'
+        and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where grid.del_flag = '0'
         and grid.type_key = 'grid_party'
         and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
@@ -1456,9 +1448,9 @@
     </select>
     <select id="selectCommunityTopicIssueList"
             resultType="com.elink.esua.epdc.dto.screen.result.CommunityTopicIssueResultDTO">
-       select
+        select
         #{customId}                                                                                                    as customerId,
-        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as datetd,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
         CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
         'W',
         WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
@@ -1470,12 +1462,14 @@
         DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
         community.id                                                                                              as agencyId,
         community.pid                                                                                               as pid,
-        ifnull(count(et.ID),0)                                                                                          as issueTotal,
-        ifnull((count(DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issuetncr
+        ifnull(count(ei.ID),0)                                                                                          as issueTotal,
+        ifnull((count(DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d') or null)),0)  as issueIncr
+
         from esua_epdc_admin.sys_dept grid
         left join esua_epdc_admin.sys_dept community on grid.pid = community.id
-        left join esua_epdc_party_group.epdc_party_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.`PARTY_MEMBER` = '1'
-        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        left join esua_epdc_group.epdc_topic et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.STATE = '10'
+        left join esua_epdc_events.epdc_issue ei on ei.ID = et.ISSUE_ID and ei.DEL_FLAG = '0'
+        and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where grid.del_flag = '0'
         and grid.type_key = 'grid_party'
         and community.del_flag = '0'
@@ -1483,6 +1477,7 @@
         and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         group by community.id;
+
     </select>
     <select id="selectGridProjectList"
             resultType="com.elink.esua.epdc.dto.screen.result.GridGridProjectResultDTO">
@@ -1582,48 +1577,36 @@
     <select id="selectGridGroupTotalList"
             resultType="com.elink.esua.epdc.dto.screen.result.GridGroupTotalResultDTO">
 
-        select grid.id                                                                                              as gridId,
-       grid.pid                                                                                             as agencyId,
-       #{customId}                                                                                                   as customerId,
-       DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                            as dateId,
-       CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
-              'W',
-              WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))        weekId,
-       DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')      AS yearId,
-       CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
-              'Q',
-              QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
-                                  '%Y-%m-%d')))                                                                quarterId,
-       DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
-       ifnull(community.groupTotal,0) as groupTotal,
-       ifnull(community.ordinaryTotal,0) as ordinaryTotal,
-       ifnull(community.branchTotal,0) as branchTotal
-from esua_epdc_admin.sys_dept grid
-         left join
-
-     (
-         select community.id as communityId,
-                count(eg.ID) as groupTotal,
-                count(eg.ID) as ordinaryTotal,
-                0            as branchTotal
-         from esua_epdc_admin.sys_dept community
-                  left join esua_epdc_party_group.epdc_party_group eg
-                            on eg.`DEPT_ID` = community.id and eg.DEL_FLAG = '0'
-         where community.del_flag = '0'
-           and community.type_key = 'community_party'
-           and community.id not in
-               (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
-           and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
-         group by community.id) community on community.communityId = grid.pid
-where grid.del_flag = '0'  and grid.type_key = 'grid_party'
-and grid.id not in
-               (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
-
+        select
+        grid.id as gridId,
+        grid.pid as agencyId,
+        #{customId}                                                                                            as customerId,
+        DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')                                             as dateId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'W',
+        WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d')))         weekId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y')       AS yearId,
+        CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
+        'Q',
+        QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
+        '%Y-%m-%d')))                                                                 quarterId,
+        DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m')  AS monthId,
+        count(eg.ID) as groupTotal,
+        count(eg.ID) as ordinaryTotal,
+        0 as branchTotal
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_group.epdc_group eg  on eg.GRID_ID = grid.id and eg.DEL_FLAG ='0'
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        group by grid.id
     </select>
     <select id="selectCommunityGroupTotalList"
             resultType="com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO">
 
-select
+
+        select
         community.id as agencyId,
         community.pid  as pid,
         #{customId}                                                                                            as customerId,
@@ -1640,13 +1623,17 @@ select
         count(eg.ID) as groupTotal,
         count(eg.ID) as ordinaryTotal,
         0 as branchTotal
-        from esua_epdc_admin.sys_dept community
-        left join `esua_epdc_party_group`.`epdc_party_group`  eg  on eg.DEPT_ID = community.id and eg.DEL_FLAG ='0'
-        where
-        community.del_flag = '0'
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_admin.sys_dept community on grid.pid = community.id
+        left join esua_epdc_group.epdc_group eg  on eg.GRID_ID = grid.id and eg.DEL_FLAG ='0'
+        where grid.del_flag = '0'
+        and grid.type_key = 'grid_party'
+        and community.del_flag = '0'
         and community.type_key = 'community_party'
+        and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         and community.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
-        and DATE_FORMAT(eg.CREA
+        and DATE_FORMAT(eg.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        group by community.id
     </select>
 
 </mapper>
diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 8f9ca2b..be95883 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -104,8 +104,10 @@
         else  'response' END  as operation,
         t1.OUT_HANDLE_ADVICE as publicReply,
         t1.HANDLE_ADVICE as internalRemark,
-        t1.CREATED_TIME as processTime
+        t1.CREATED_TIME as processTime,
+        CASE WHEN eit.EVALUATION_SCORE = 2 then 100 WHEN eit.EVALUATION_SCORE = 1 then 80 ELSE 60 END as satisfactionScore
         from esua_epdc_events.epdc_item_handle_process t1
+        LEFT JOIN esua_epdc_events.epdc_item eit on eit.ID =t1.ITEM_ID
         left join esua_epdc_events.epdc_item_dept t4 on t4.ITEM_HANDLE_ID = t1.ID
         where  date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d')
         and date_format(t1.UPDATED_TIME, '%Y-%m-%d')  &lt;= date_sub(curdate(),interval 1 day) and t1.DEL_FLAG = '0'