diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
index 5d8ceca..e07e1b9 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenGovernanceDao.xml
@@ -264,108 +264,78 @@
 
     <select id="gridgoverndaily" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridGovernDailyResultDTO">
           SELECT
-            DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y%m%d' ) AS dateId,
-            sd.id AS agencyId,
-        CASE
-
-                WHEN sd.type_key = 'community_party' || sd.type_key = 'community_dept' THEN
-                'community'
-                WHEN sd.type_key = 'street_party' ||sd.type_key = 'street_dept' THEN
-                'street'
-                WHEN sd.type_key = 'district_party' || sd.type_key = 'district_dept' THEN
-                'district'
-            END AS LEVEL,
-            sd.pid,
-            sd.pids,
-            IFNULL( sum( info.problemResolvedCount ), 0 ) AS problemResolvedCount,
-            IFNULL( sum( info.topicResolvedCount ), 0 ) AS topicResolvedCount,
-            IFNULL( sum( info.topicUnResolvedCount ), 0 ) AS topicUnResolvedCount,
-            IFNULL( sum( info.issueResolvedCount ), 0 ) AS issueResolvedCount,
-            IFNULL( sum( info.issueUnResolvedCount ), 0 ) AS issueUnResolvedCount,
-            IFNULL( sum( info.issueProjectResolvedCount ), 0 ) AS issueProjectResolvedCount,
-            IFNULL( sum( info.issueProjectUnResolvedCount ), 0 ) AS issueProjectUnResolvedCount,
-            IFNULL( sum( info.approvalProjectResolvedCount ), 0 ) AS approvalProjectResolvedCount,
-            IFNULL( sum( info.approvalProjectUnResolvedCount ), 0 ) AS approvalProjectUnResolvedCount,
-            IFNULL( sum( info.inGroupTopicResolvedCount ), 0 ) AS inGroupTopicResolvedCount,
-            IFNULL( sum( info.inGroupTopicUnResolvedCount ), 0 ) AS inGroupTopicUnResolvedCount,
-            IFNULL( sum( info.gridSelfGovernProjectTotal ), 0 ) AS gridSelfGovernProjectTotal,
-            IFNULL( sum( info.communityClosedCount ), 0 ) AS communityClosedCount,
-            IFNULL( sum( info.streetClosedCount ), 0 ) AS streetClosedCount,
-            0 AS districtDeptClosedCount,
-
-            0 AS eventResolvedCount,
-            0 AS eventUnResolvedCount,
-
-            IFNULL( ( sum( info.inGroupTopicResolvedCount ) + sum( info.inGroupTopicUnResolvedCount ) )
-            / sum( info.problemResolvedCount ), 0 ) AS groupSelfGovernRatio,
-            IFNULL( sum( info.gridSelfGovernProjectTotal ) / sum( info.problemResolvedNum ), 0 ) AS gridSelfGovernRatio,
-            IFNULL( sum( info.communityClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS communityClosedRatio,
-            IFNULL( sum( info.streetClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS streetClosedRatio,
-            IFNULL( sum( info.districtClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS districtDeptClosedRatio
+            info.*,
+			IFNULL((info.problemResolvedCount - info.communityClosedCount - info.streetClosedCount - info.districtClosedCount), 0) gridSelfGovernProjectTotal,
+            IFNULL( ( info.inGroupTopicResolvedCount + info.inGroupTopicUnResolvedCount ) / info.problemResolvedCount, 0 ) AS groupSelfGovernRatio,
+            IFNULL( IFNULL((info.problemResolvedCount - info.communityClosedCount - info.streetClosedCount - info.districtClosedCount), 0)
+						 / info.problemResolvedCount, 0 ) AS gridSelfGovernRatio,
+            IFNULL( info.communityClosedCount / info.problemResolvedCount, 0 ) AS communityClosedRatio,
+            IFNULL( info.streetClosedCount / info.problemResolvedCount, 0 ) AS streetClosedRatio,
+            IFNULL( info.districtClosedCount / info.problemResolvedCount, 0 ) AS districtDeptClosedRatio
         FROM
             (
             SELECT
+                DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y%m%d' ) AS dateId,
+                sd.id AS gridId,
+                sd.pid,
                 sd.pids,
-                IFNULL ((
-                    IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 )
-                ), 0 ) AS problemResolvedCount,
-
                 IFNULL(
                     (
-                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + IFNULL( item.approvalProjectResolvedCount, 0 )
-                        + IFNULL( item.approvalProjectUnResolvedCount, 0 )
-                    ), 0 ) AS problemResolvedNum,
+                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
+                    ), 0 ) AS problemResolvedCount,
 
                 IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,
                 IFNULL( topic.topicUnResolvedCount, 0 ) AS topicUnResolvedCount,
+                IFNULL( topic.inGroupTopicResolvedCount, 0 ) AS inGroupTopicResolvedCount,
+                IFNULL( topic.inGroupTopicUnResolvedCount, 0 ) AS inGroupTopicUnResolvedCount,
+
                 IFNULL( issue.issueResolvedCount, 0 ) AS issueResolvedCount,
                 IFNULL( issue.issueUnResolvedCount, 0 ) AS issueUnResolvedCount,
+
                 IFNULL( item.issueProjectResolvedCount, 0 ) AS issueProjectResolvedCount,
                 IFNULL( item.issueProjectUnResolvedCount, 0 ) AS issueProjectUnResolvedCount,
                 IFNULL( item.approvalProjectResolvedCount, 0 ) AS approvalProjectResolvedCount,
                 IFNULL( item.approvalProjectUnResolvedCount, 0 ) AS approvalProjectUnResolvedCount,
-                IFNULL( topic.inGroupTopicResolvedCount, 0 ) AS inGroupTopicResolvedCount,
-                IFNULL( topic.inGroupTopicUnResolvedCount, 0 ) AS inGroupTopicUnResolvedCount,
+
                 IFNULL( selfsolved.fromIssueResolvedInGridCount, 0 ) AS fromIssueResolvedInGridCount,
                 IFNULL( selfsolved.fromIssueUnResolvedInGridCount, 0 ) AS fromIssueUnResolvedInGridCount,
                 IFNULL( selfsolved.fromAgencyResolvedInGridCount, 0 ) AS fromAgencyResolvedInGridCount,
                 IFNULL( selfsolved.fromAgencyUnResolvedInGridCount, 0 ) AS fromAgencyUnResolvedInGridCount,
 
-                IFNULL( gridSelfGovernProjectTotal, 0 ) AS gridSelfGovernProjectTotal,
+                0 AS eventResolvedCount,
+                0 AS eventUnResolvedCount,
+
                 IFNULL( commsolved.communityClosedCount, 0 ) AS communityClosedCount,
                 IFNULL( streetsolved.streetClosedCount, 0 ) AS streetClosedCount,
                 IFNULL( districtsolved.districtClosedCount, 0 ) AS districtClosedCount
             FROM
                 esua_epdc_admin.sys_dept sd
                 LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
-                    IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
-                    0 AS topicUnResolvedCount,
-                    0 AS inGroupTopicUnResolvedCount
-                FROM
-                    esua_epdc_group.epdc_topic et
-                WHERE
-                    et.DEL_FLAG = '0'
-                    AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND et.STATE = '20'
-                GROUP BY
-                    et.GRID_ID
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
+						0 AS topicUnResolvedCount,
+                        IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
+                        0 AS inGroupTopicUnResolvedCount
+                    FROM
+                        esua_epdc_group.epdc_topic et
+                    WHERE
+                        et.DEL_FLAG = '0'
+                        AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    AND et.STATE = '20'
+                    GROUP BY et.GRID_ID
                 ) topic ON topic.GRID_ID = sd.id
                 LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
-                    0 AS issueUnResolvedCount
-                FROM
-                    esua_epdc_events.epdc_issue eis
-                WHERE
-                    eis.DEL_FLAG = '0'
-                    AND DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND eis.ISSUE_STATE = '2'
-                GROUP BY
-                    eis.GRID_ID
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
+                        0 AS issueUnResolvedCount
+                    FROM
+                        ( SELECT UPDATED_TIME, ISSUE_STATE, GRID_ID FROM esua_epdc_events.epdc_issue WHERE `DEL_FLAG` ='0' GROUP BY `EVENT_ID`  ) eis
+                    WHERE
+                        DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    AND eis.ISSUE_STATE = '2'
+                    GROUP BY 	eis.GRID_ID
                 ) issue ON issue.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -375,13 +345,11 @@
                     0 AS approvalProjectResolvedCount,
                     0 AS approvalProjectUnResolvedCount
                 FROM
-                    esua_epdc_events.epdc_item eit
+                    ( SELECT UPDATED_TIME,ITEM_STATE,GRID_ID FROM esua_epdc_events.epdc_item eit
+										WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                 WHERE
-                    eit.DEL_FLAG = '0'
-                    AND DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND eit.ITEM_STATE IN ( '5', '10' )
-                GROUP BY
-                    GRID_ID
+                    DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                GROUP BY GRID_ID
                 ) item ON item.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -399,15 +367,12 @@
                         eit.UPDATED_TIME,
                         eit.ITEM_STATE
                     FROM
-                        esua_epdc_events.epdc_item eit
+						( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item
+						  WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
-                    GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                        hp.DEL_FLAG = '0'
+                    GROUP BY eit.GRID_ID, eit.ID
                     HAVING
                         COUNT( DISTINCT hp.HANDLER_DEPT_ID ) = 1
                     ) t
@@ -417,11 +382,10 @@
                 GROUP BY
                     t.GRID_ID
                 ) selfsolved ON selfsolved.GRID_ID = sd.id
-
                 LEFT JOIN (
                     SELECT
                         GRID_ID,
-                        IFNULL( COUNT( 0 ), 0 ) AS gridSelfGovernProjectTotal
+                        IFNULL( COUNT( 0 ), 0 ) AS communityClosedCount
                     FROM
                         (
                         SELECT
@@ -430,50 +394,19 @@
                             hp.HANDLER_DEPT_ID,
                             eit.UPDATED_TIME
                         FROM
-                            esua_epdc_events.epdc_item eit
+                             ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                             LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                             LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                         WHERE
-                            eit.DEL_FLAG = '0'
-                            AND hp.DEL_FLAG = '0'
-                            AND eit.ITEM_STATE IN ( '5', '10' )
+                            hp.DEL_FLAG = '0'
                             AND hp.STATE IN ( '5', '10' )
-                            AND sd.type_key IN ('grid_party', 'grid_dept')
+                            AND sd.type_key IN ('community_party', 'community_dept')
                         GROUP BY eit.GRID_ID, eit.ID
                         ) t
                     WHERE
                         DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
                     GROUP BY t.GRID_ID
-                ) gridsolved ON gridsolved.GRID_ID = sd.id
-                LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS communityClosedCount
-                FROM
-                    (
-                    SELECT
-                        GRID_ID,
-                        eit.id,
-                        hp.HANDLER_DEPT_ID,
-                        eit.UPDATED_TIME
-                    FROM
-                        esua_epdc_events.epdc_item eit
-                        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
-                        LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
-                    WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
-                        AND hp.STATE IN ( '5', '10' )
-                        AND sd.type_key IN ('community_party', 'community_dept')
-                    GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
-                    ) t
-                WHERE
-                    DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                GROUP BY
-                    t.GRID_ID
                 ) commsolved ON commsolved.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -487,23 +420,19 @@
                         hp.HANDLER_DEPT_ID,
                         eit.UPDATED_TIME
                     FROM
-                        esua_epdc_events.epdc_item eit
+                        ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                         LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
+                        hp.DEL_FLAG = '0'
                         AND hp.STATE IN ( '5', '10' )
                         AND sd.type_key IN ('street_party', 'street_dept')
-                    GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                    GROUP BY eit.GRID_ID, eit.ID
                     ) t
                 WHERE
                     DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                GROUP BY
-                    t.GRID_ID
+                GROUP BY t.GRID_ID
                 ) streetsolved ON streetsolved.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -517,46 +446,34 @@
                         hp.HANDLER_DEPT_ID,
                         eit.UPDATED_TIME
                     FROM
-                        esua_epdc_events.epdc_item eit
+                         ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+						WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                         LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
+                        hp.DEL_FLAG = '0'
                         AND hp.STATE IN ( '5', '10' )
                         AND sd.type_key IN ('district_party', 'district_dept')
-                    GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                    GROUP BY eit.GRID_ID, eit.ID
                     ) t
                 WHERE
                     DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                GROUP BY
-                    t.GRID_ID
+                GROUP BY t.GRID_ID
                 ) districtsolved ON districtsolved.GRID_ID = sd.id
-            WHERE
+
+                WHERE
                 sd.del_flag = '0'
-                AND sd.type_key = 'grid_party'
+                AND sd.type_key IN ('grid_party', 'grid_dept')
                 AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
-            GROUP BY
-                sd.id
+                GROUP BY sd.id
             ) info
-            LEFT JOIN esua_epdc_admin.sys_dept sd ON find_in_set( sd.`id`, info.pids )
-        WHERE
-            sd.del_flag = '0'
-            AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
-            AND sd.type_key IN ( 'community_party', 'community_dept', 'street_party', 'street_dept', 'district_party', 'district_dept' )
-        GROUP BY
-            sd.id
     </select>
 
     <select id="agencygoverndaily" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyGovernDailyResultDTO">
-        SELECT
+          SELECT
             DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y%m%d' ) AS dateId,
             sd.id AS agencyId,
-        CASE
-
+						CASE
                 WHEN sd.type_key = 'community_party' || sd.type_key = 'community_dept' THEN
                 'community'
                 WHEN sd.type_key = 'street_party' ||sd.type_key = 'street_dept' THEN
@@ -577,35 +494,38 @@
             IFNULL( sum( info.approvalProjectUnResolvedCount ), 0 ) AS approvalProjectUnResolvedCount,
             IFNULL( sum( info.inGroupTopicResolvedCount ), 0 ) AS inGroupTopicResolvedCount,
             IFNULL( sum( info.inGroupTopicUnResolvedCount ), 0 ) AS inGroupTopicUnResolvedCount,
-            IFNULL( sum( info.gridSelfGovernProjectTotal ), 0 ) AS gridSelfGovernProjectTotal,
+            IFNULL(( IFNULL( sum( info.problemResolvedCount ), 0 )
+                - IFNULL( sum( info.communityClosedCount ), 0 )
+                - IFNULL( sum( info.streetClosedCount ), 0 )
+                - IFNULL( sum( info.districtClosedCount ), 0 )), 0
+            ) gridSelfGovernProjectTotal,
+
             IFNULL( sum( info.communityClosedCount ), 0 ) AS communityClosedCount,
             IFNULL( sum( info.streetClosedCount ), 0 ) AS streetClosedCount,
-            0 AS districtDeptClosedCount,
+            IFNULL( sum( info.districtClosedCount ), 0 ) AS districtDeptClosedCount,
 
-            IFNULL( sum( info.issueProjectResolvedCount ), 0 ) AS eventResolvedCount,
-            IFNULL( sum( info.issueProjectUnResolvedCount ), 0 ) AS eventUnResolvedCount,
+            0 AS eventResolvedCount,
+            0 AS eventUnResolvedCount,
 
             IFNULL( ( sum( info.inGroupTopicResolvedCount ) + sum( info.inGroupTopicUnResolvedCount ) )
             / sum( info.problemResolvedCount ), 0 ) AS groupSelfGovernRatio,
-            IFNULL( sum( info.gridSelfGovernProjectTotal ) / sum( info.problemResolvedNum ), 0 ) AS gridSelfGovernRatio,
-            IFNULL( sum( info.communityClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS communityClosedRatio,
-            IFNULL( sum( info.streetClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS streetClosedRatio,
-            IFNULL( sum( info.districtClosedCount ) / sum( info.problemResolvedNum ), 0 ) AS districtDeptClosedRatio
+            IFNULL( IFNULL(( IFNULL( sum( info.problemResolvedCount ), 0 )
+                                    - IFNULL( sum( info.communityClosedCount ), 0 )
+                                    - IFNULL( sum( info.streetClosedCount ), 0 )
+                                    - IFNULL( sum( info.districtClosedCount ), 0 )), 0
+                                )
+                 / sum( info.problemResolvedCount ), 0 ) AS gridSelfGovernRatio,
+            IFNULL( sum( info.communityClosedCount ) / sum( info.problemResolvedCount ), 0 ) AS communityClosedRatio,
+            IFNULL( sum( info.streetClosedCount ) / sum( info.problemResolvedCount ), 0 ) AS streetClosedRatio,
+            IFNULL( sum( info.districtClosedCount ) / sum( info.problemResolvedCount ), 0 ) AS districtDeptClosedRatio
         FROM
             (
             SELECT
                 sd.pids,
                 IFNULL ((
-                    IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 )
-                    + IFNULL( item.approvalProjectResolvedCount, 0 ) + IFNULL( item.approvalProjectUnResolvedCount, 0 )
+                    IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
                 ), 0 ) AS problemResolvedCount,
 
-                IFNULL(
-                    (
-                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + IFNULL( item.approvalProjectResolvedCount, 0 )
-                        + IFNULL( item.approvalProjectUnResolvedCount, 0 )
-                    ), 0 ) AS problemResolvedNum,
-
                 IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,
                 IFNULL( topic.topicUnResolvedCount, 0 ) AS topicUnResolvedCount,
                 IFNULL( issue.issueResolvedCount, 0 ) AS issueResolvedCount,
@@ -621,63 +541,57 @@
                 IFNULL( selfsolved.fromAgencyResolvedInGridCount, 0 ) AS fromAgencyResolvedInGridCount,
                 IFNULL( selfsolved.fromAgencyUnResolvedInGridCount, 0 ) AS fromAgencyUnResolvedInGridCount,
 
-                IFNULL( gridSelfGovernProjectTotal, 0 ) AS gridSelfGovernProjectTotal,
                 IFNULL( commsolved.communityClosedCount, 0 ) AS communityClosedCount,
                 IFNULL( streetsolved.streetClosedCount, 0 ) AS streetClosedCount,
                 IFNULL( districtsolved.districtClosedCount, 0 ) AS districtClosedCount
             FROM
                 esua_epdc_admin.sys_dept sd
                 LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
-                    IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
-                    0 AS topicUnResolvedCount,
-                    0 AS inGroupTopicUnResolvedCount
-                FROM
-                    esua_epdc_group.epdc_topic et
-                WHERE
-                    et.DEL_FLAG = '0'
-                    AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND et.STATE = '20'
-                GROUP BY
-                    et.GRID_ID
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS topicResolvedCount,
+                        IFNULL( COUNT( 0 ), 0 ) AS inGroupTopicResolvedCount,
+                        0 AS topicUnResolvedCount,
+                        0 AS inGroupTopicUnResolvedCount
+                    FROM
+                        esua_epdc_group.epdc_topic et
+                    WHERE
+                        et.DEL_FLAG = '0'
+                        AND DATE_FORMAT( et.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                        AND et.STATE = '20'
+                    GROUP BY et.GRID_ID
                 ) topic ON topic.GRID_ID = sd.id
                 LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
-                    0 AS issueUnResolvedCount
-                FROM
-                    esua_epdc_events.epdc_issue eis
-                WHERE
-                    eis.DEL_FLAG = '0'
-                    AND DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND eis.ISSUE_STATE = '2'
-                GROUP BY
-                    eis.GRID_ID
+                    SELECT
+                        GRID_ID,
+                        IFNULL( COUNT( 0 ), 0 ) AS issueResolvedCount,
+                        0 AS issueUnResolvedCount
+                    FROM
+                         ( SELECT UPDATED_TIME, ISSUE_STATE, GRID_ID FROM esua_epdc_events.epdc_issue WHERE `DEL_FLAG` ='0' GROUP BY `EVENT_ID`  ) eis
+                    WHERE
+                        DATE_FORMAT( eis.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                        AND eis.ISSUE_STATE = '2'
+                    GROUP BY eis.GRID_ID
                 ) issue ON issue.GRID_ID = sd.id
                 LEFT JOIN (
-                SELECT
-                    GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS issueProjectResolvedCount,
-                    0 AS issueProjectUnResolvedCount,
-                    0 AS approvalProjectResolvedCount,
-                    0 AS approvalProjectUnResolvedCount
-                FROM
-                    esua_epdc_events.epdc_item eit
-                WHERE
-                    eit.DEL_FLAG = '0'
-                    AND DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                AND eit.ITEM_STATE IN ( '5', '10' )
-                GROUP BY
-                    GRID_ID
+                    SELECT
+                        GRID_ID,
+                        IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS issueProjectResolvedCount,
+                        IFNULL( SUM( IF((eit.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS issueProjectUnResolvedCount,
+                        0 AS approvalProjectResolvedCount,
+                        0 AS approvalProjectUnResolvedCount
+                    FROM
+                        ( SELECT UPDATED_TIME,ITEM_STATE,GRID_ID FROM esua_epdc_events.epdc_item
+                            WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
+                    WHERE
+                        DATE_FORMAT( eit.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
+                    GROUP BY GRID_ID
                 ) item ON item.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
                     GRID_ID,
-                    IFNULL( COUNT( 0 ), 0 ) AS fromIssueResolvedInGridCount,
-                    0 AS fromIssueUnResolvedInGridCount,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '10', 1, 0)), 0 ) AS fromIssueResolvedInGridCount,
+                    IFNULL( SUM( IF((t.`ITEM_STATE`)  = '5', 1, 0)), 0 )  AS fromIssueUnResolvedInGridCount,
                     0 AS fromAgencyResolvedInGridCount,
                     0 AS fromAgencyUnResolvedInGridCount
                 FROM
@@ -686,19 +600,16 @@
                         GRID_ID,
                         eit.id,
                         hp.HANDLER_DEPT_ID,
-                        eit.UPDATED_TIME
+                        eit.UPDATED_TIME,
+                        eit.ITEM_STATE
                     FROM
-                        esua_epdc_events.epdc_item eit
-                        LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
+                        ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
+						LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
-                    GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
-                    HAVING
-                        COUNT( DISTINCT hp.HANDLER_DEPT_ID ) = 1
+                        hp.DEL_FLAG = '0'
+                    GROUP BY eit.GRID_ID, eit.ID
+                    HAVING COUNT( DISTINCT hp.HANDLER_DEPT_ID ) = 1
                     ) t
                 WHERE
                     t.GRID_ID = t.HANDLER_DEPT_ID
@@ -707,33 +618,6 @@
                     t.GRID_ID
                 ) selfsolved ON selfsolved.GRID_ID = sd.id
 
-                LEFT JOIN (
-                    SELECT
-                        GRID_ID,
-                        IFNULL( COUNT( 0 ), 0 ) AS gridSelfGovernProjectTotal
-                    FROM
-                        (
-                        SELECT
-                            GRID_ID,
-                            eit.id,
-                            hp.HANDLER_DEPT_ID,
-                            eit.UPDATED_TIME
-                        FROM
-                            esua_epdc_events.epdc_item eit
-                            LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
-                            LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
-                        WHERE
-                            eit.DEL_FLAG = '0'
-                            AND hp.DEL_FLAG = '0'
-                            AND eit.ITEM_STATE IN ( '5', '10' )
-                            AND hp.STATE IN ( '5', '10' )
-                            AND sd.type_key IN ('grid_party', 'grid_dept')
-                        GROUP BY eit.GRID_ID, eit.ID
-                        ) t
-                    WHERE
-                        DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                    GROUP BY t.GRID_ID
-                ) gridsolved ON gridsolved.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
                     GRID_ID,
@@ -746,23 +630,20 @@
                         hp.HANDLER_DEPT_ID,
                         eit.UPDATED_TIME
                     FROM
-                        esua_epdc_events.epdc_item eit
+                        ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                         LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
+                        hp.DEL_FLAG = '0'
                         AND hp.STATE IN ( '5', '10' )
                         AND sd.type_key IN ('community_party', 'community_dept')
                     GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                        eit.GRID_ID, eit.ID
                     ) t
                 WHERE
                     DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                GROUP BY
-                    t.GRID_ID
+                GROUP BY t.GRID_ID
                 ) commsolved ON commsolved.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -776,23 +657,20 @@
                         hp.HANDLER_DEPT_ID,
                         eit.UPDATED_TIME
                     FROM
-                        esua_epdc_events.epdc_item eit
+                         ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                         LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
+                        hp.DEL_FLAG = '0'
                         AND hp.STATE IN ( '5', '10' )
                         AND sd.type_key IN ('street_party', 'street_dept')
                     GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                        eit.GRID_ID, eit.ID
                     ) t
                 WHERE
                     DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
-                GROUP BY
-                    t.GRID_ID
+                GROUP BY t.GRID_ID
                 ) streetsolved ON streetsolved.GRID_ID = sd.id
                 LEFT JOIN (
                 SELECT
@@ -806,18 +684,16 @@
                         hp.HANDLER_DEPT_ID,
                         eit.UPDATED_TIME
                     FROM
-                        esua_epdc_events.epdc_item eit
+                         ( SELECT GRID_ID, ID, UPDATED_TIME, ITEM_STATE FROM esua_epdc_events.epdc_item eit
+												WHERE DEL_FLAG = '0' AND ITEM_STATE IN ( '5', '10' ) GROUP BY EVENT_ID) eit
                         LEFT JOIN esua_epdc_events.epdc_item_handle_process hp ON hp.item_id = eit.id
                         LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.id = hp.HANDLER_DEPT_ID
                     WHERE
-                        eit.DEL_FLAG = '0'
-                        AND hp.DEL_FLAG = '0'
-                        AND eit.ITEM_STATE IN ( '5', '10' )
+                        hp.DEL_FLAG = '0'
                         AND hp.STATE IN ( '5', '10' )
                         AND sd.type_key IN ('district_party', 'district_dept')
                     GROUP BY
-                        eit.GRID_ID,
-                        eit.ID
+                        eit.GRID_ID, eit.ID
                     ) t
                 WHERE
                     DATE_FORMAT( t.UPDATED_TIME, '%Y-%m-%d' ) &lt;= DATE_FORMAT( date_add( now(), INTERVAL - 1 DAY ), '%Y-%m-%d' )
@@ -836,7 +712,7 @@
             sd.del_flag = '0'
             AND sd.id NOT IN ( SELECT t.dept_id FROM esua_epdc_admin.sys_dept_config t WHERE t.del_flag = '0' )
             AND sd.type_key IN ( 'community_party', 'community_dept', 'street_party', 'street_dept', 'district_party', 'district_dept' )
-        GROUP BY sd.id
+        GROUP BY  sd.id
     </select>
 
 </mapper>