From aef3ae94d864844174c994cd55202bfa21d55596 Mon Sep 17 00:00:00 2001 From: Ruslan Date: Fri, 21 Mar 2025 10:24:10 +0300 Subject: [PATCH] fix avg subpoena --- .../total_registered.subpoenas(m_c).hpl | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c).hpl b/v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c).hpl index c0aae7e..486c9b0 100644 --- a/v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c).hpl +++ b/v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c).hpl @@ -366,17 +366,28 @@ t1 AS ( GROUP BY ls.department_id, ls.mil_reg ), t2 AS ( - SELECT - ls.mil_reg, - ls.department_id, - ROUND( - AVG( - CASE - WHEN ls.sub_stat_hist = '4.2' THEN GREATEST(EXTRACT(DAY FROM (ls.history_date::timestamp - ls.visit_date::timestamp)), 0) - ELSE GREATEST(EXTRACT(DAY FROM (CURRENT_DATE::timestamp - ls.visit_date::timestamp)), 0) - END), 1) AS average_appeared - FROM last_status ls - GROUP BY ls.department_id, ls.mil_reg +SELECT + ls.mil_reg, + ls.department_id, + ROUND( + AVG( + CASE + WHEN ls.sub_stat_hist = '4.2' THEN + GREATEST(EXTRACT(DAY FROM (ls.history_date::timestamp - ls.visit_date::timestamp)), 0) + ELSE + GREATEST(EXTRACT(DAY FROM (CURRENT_DATE::timestamp - ls.visit_date::timestamp)), 0) + END + ) FILTER (WHERE + CASE + WHEN ls.sub_stat_hist = '4.2' THEN + EXTRACT(DAY FROM (ls.history_date::timestamp - ls.visit_date::timestamp)) + ELSE + EXTRACT(DAY FROM (CURRENT_DATE::timestamp - ls.visit_date::timestamp)) + END > 0 + ), 1 + ) AS average_appeared +FROM last_status ls +GROUP BY ls.department_id, ls.mil_reg ), t3 AS ( SELECT