From 5daeb7081d3a44fb97ead7ff686ce3b66d5267ab Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 18 Jul 2025 15:09:40 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mappers/dashboard/ChartMapper.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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}