diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 50f2b4b1..a782949e 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -188,7 +188,7 @@ SELECT detail_uicode.code_text AS region_detail_name, parent_uicode.code_text AS region_name, - COUNT(DISTINCT h.seq) AS household_count, + COUNT(DISTINCT rhh.household_seq) AS household_count, CASE WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1) ELSE 0 @@ -203,6 +203,9 @@ ON h.region_detail_code = detail_uicode.id AND h.is_deleted = false AND h.is_panel = true + LEFT JOIN researcher_has_household rhh + ON rhh.household_seq = h.seq + AND rhh.is_deleted = false LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} @@ -226,13 +229,16 @@ SELECT '전체' AS region_detail_name, '전체' AS region_name, - COUNT(DISTINCT h.seq) AS household_count, + COUNT(DISTINCT rhh.household_seq) AS household_count, COALESCE(ROUND(AVG(v.completion_rate), 1), 0), COUNT(DISTINCT hv_visit.household_seq), COUNT(DISTINCT hv_gift.household_seq), -1 AS region_order, -1 AS region_detail_order FROM household h + LEFT JOIN researcher_has_household rhh + ON rhh.household_seq = h.seq + AND rhh.is_deleted = false LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth}