Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-17 11:50:51 +09:00
3 changed files with 110 additions and 7 deletions

View File

@@ -12,6 +12,7 @@
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1) , 0 ) as gift_sent_percent
FROM household h
JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT join household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
WHERE h.is_deleted = false
@@ -32,6 +33,7 @@
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as gift_sent_percent
FROM household h
JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false
JOIN researcher_has_household rhh on rhh.household_seq = h.seq and rhh.admin_seq = #{adminSeq} and rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
@@ -136,10 +138,11 @@
LEFT JOIN household_visit hv
ON hv.household_seq = h.seq
AND hv.is_deleted = false
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
WHERE u.parent_id = 'code.region.main'
WHERE u.parent_id = 'code.region.main' and u.in_use = true and u.is_deleted = false
GROUP BY u.code_text, u.order_no
UNION ALL
-- 전체 합계 행
@@ -169,10 +172,11 @@
LEFT JOIN household_visit hv
ON hv.household_seq = h.seq
AND hv.is_deleted = false
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
WHERE u.parent_id = 'code.region.main'
WHERE u.parent_id = 'code.region.main' and u.in_use = true and u.is_deleted = false
ORDER BY order_no
</select>
@@ -209,6 +213,7 @@
ON hv_gift.household_seq = h.seq
AND hv_gift.is_deleted = false
AND hv_gift.is_gift_sent = true
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
WHERE detail_uicode.id LIKE 'code.region.detail.%'
GROUP BY
detail_uicode.code_text,
@@ -238,6 +243,7 @@
ON hv_gift.household_seq = h.seq
AND hv_gift.is_deleted = false
AND hv_gift.is_gift_sent = true
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
WHERE h.is_deleted = false AND h.is_panel = true
order by
region_order ASC,