diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
index a2b0f043..09418031 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
@@ -91,7 +91,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
         List<GridGroupTotalResultDTO> gridGroupTotalResultDTOS = baseDao.selectGridGroupTotalList(customerId);
         String dataJson = ScreenDataUtils.getScreenDateJson(gridGroupTotalResultDTOS,true);
         // 数据上报
-        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson);
+        String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_GROUP_TOTAL, dataJson);
+        log.info(body);
         return new Result();
     }
 
@@ -119,7 +120,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
         List<CommunityHotTopicResultDTO> communityHotTopicResultDTOS = baseDao.selectAgencyHotTopic(customerId);
         String dataJson = ScreenDataUtils.getScreenDateJson(communityHotTopicResultDTOS,true);
         // 数据上报
-        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC, dataJson);
+        String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_HOT_TOPIC, dataJson);
+        log.info(body);
         return new Result();    }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
index 1ffc0a79..3b76bf54 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
@@ -169,7 +169,7 @@
         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
         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'
+        left join esua_epdc_events.epdc_issue et on et.GRID_ID = grid.ID and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
         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'
@@ -196,7 +196,7 @@
         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
         from esua_epdc_admin.sys_dept sd
-        left join esua_epdc_party_group.epdc_party_topic et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' and et.`PARTY_MEMBER` = '1'
+        left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS) and et.DEL_FLAG = '0' and et.IS_PARTY_MEMBER = '1'
         and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         where sd.del_flag = '0'
         and sd.type_key in  ( 'street_party', 'community_party' )
@@ -366,224 +366,88 @@ and grid.id not in
         group by sd.id;
     </select>
     <select id="selectGridHotTopic" resultType="com.elink.esua.epdc.dto.screen.result.GridHotTopicResultDTO">
-       SELECT
-       '${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,
+        select a.*,
+        (ifnull(a.partyTopicTotal, 0)+ ifnull(b.issueTotal, 0))  as topicTotal
+        from(
+        SELECT '${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,
         sd.id AS gridId,
         sd.pid AS agencyId,
-        IFNULL(COUNT(et.id), 0) AS topicTotal,
+        IFNULL(COUNT(et.id), 0)  AS partyTopicTotal,
         'hot_discuss' AS STATUS,
-        IFNULL(
-        SUM(
-        CASE
-        WHEN et.STATE = '0' THEN
-        1
-        ELSE
-        0
-        END
-        ),
-        0
-        ) AS topicCount
-        FROM
-        esua_epdc_admin.sys_dept sd
-        LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id = et.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
-        sd.del_flag = '0'
-        AND sd.type_key = 'grid_party'
-        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
+        IFNULL(SUM(CASE WHEN et.STATE= '0' THEN 1 ELSE 0 END), 0)  AS topicCount
+        FROM esua_epdc_admin.sys_dept sd
+        LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON sd.id= et.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 sd.del_flag= '0'
+        AND sd.type_key= 'grid_party'
+        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) a
+        left join(
+        select grid.id as gridId, ifnull(count(et.ID), 0) as issueTotal
+        from esua_epdc_admin.sys_dept grid
+        left join esua_epdc_events.epdc_issue et on et.GRID_ID= grid.ID
+        and et.DEL_FLAG= '0'
+        and et.IS_PARTY_MEMBER= '1'
+        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 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) b on a.gridId= b.gridId
     </select>
     <select id="selectAgencyHotTopic"
             resultType="com.elink.esua.epdc.dto.screen.result.CommunityHotTopicResultDTO">
-        SELECT
-        '${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,
+        SELECT a.*,(ifnull(a.partyTopicTotal,0) + ifnull(b.issueTotal,0)) as topicTotal from (
+        SELECT '${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,
         sd.id AS agencyId,
         sd.pid AS pid,
-        IFNULL(COUNT(et.id), 0) AS topicTotal,
+        IFNULL(COUNT(et.id), 0)  AS partyTopicTotal,
         'hot_discuss' AS STATUS,
-        IFNULL(
-        SUM(
-        CASE
-        WHEN et.STATE = '0' THEN
-        1
-        ELSE
-        0
-        END
-        ),
-        0
-        ) AS topicCount
-        FROM
-        esua_epdc_admin.sys_dept sd
+        IFNULL(SUM(CASE WHEN et.STATE= '0' THEN 1 ELSE 0 END), 0)  AS topicCount
+        FROM esua_epdc_admin.sys_dept sd
         LEFT JOIN esua_epdc_party_group.epdc_party_topic et ON find_in_set(sd.`id`, et.`ALL_DEPT_IDS`)
-        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
-        sd.del_flag = '0'
-        AND sd.type_key IN (
-        'community_party',
-        'street_party'
-        )
-        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
+        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 sd.del_flag= '0'
+        AND sd.type_key IN('community_party', 'street_party')
+        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)a
+        left join
+        (
+        select sd.id as agencyId,
+        ifnull(count(et.ID), 0) as issueTotal
+        from esua_epdc_admin.sys_dept sd
+        left join esua_epdc_events.epdc_issue et on find_in_set(sd.id,et.ALL_DEPT_IDS)
+        and et.DEL_FLAG= '0'
+        and et.IS_PARTY_MEMBER= '1'
+        and DATE_FORMAT(et.CREATED_TIME, '%Y-%m-%d')  &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
+        where sd.del_flag= '0'
+        and sd.type_key in('street_party', 'community_party')
+        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)b on a.agencyId = b.agencyId
+
     </select>
     <select id="selectGridIssue" resultType="com.elink.esua.epdc.dto.screen.result.GridIssueResultDTO">
         SELECT