diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index e77b00012b..77f6fb0108 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -22,7 +22,7 @@
             AND eve.DEL_FLAG = '0'
         WHERE
             diff.DEL_FLAG = '0'
-            AND diff.PARENT_ID = #{agencyId}
+            AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
          ORDER BY
          CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
                        WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
index 26007e2997..b15df8d588 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
@@ -17,7 +17,7 @@
             screen_org_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND PARENT_ID	= #{agencyId}
+            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
             AND MONTH_ID = #{monthId}
             ORDER BY
             (PARTY_TOTAL + GROUP_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL + CLOSE_PROJECT_RATIO + SATISFACTION_RATIO) DESC,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 66fb4d6a80..a61e832fab 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -12,7 +12,7 @@
             screen_party_user_rank_data
         WHERE
             del_flag = '0'
-            AND org_id = #{agencyId}
+            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
         ORDER BY
             point_total DESC,
             user_name
@@ -30,7 +30,7 @@
             screen_party_user_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_ID = #{agencyId}
+            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
             AND PARTY_FLAG = '1'
         ORDER BY
             POINT_TOTAL DESC