From d8594e4276bc40a7e87af81febce408d06631e47 Mon Sep 17 00:00:00 2001
From: Ruslan <r.gaztdinov@micord.ru>
Date: Wed, 19 Mar 2025 11:25:24 +0300
Subject: [PATCH] fix

---
 .../ratings/ratings.conscription_info.hpl     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/v1_apache-hop dash mapping/ratings/ratings.conscription_info.hpl b/v1_apache-hop dash mapping/ratings/ratings.conscription_info.hpl
index 8f1d9e8..e967cbc 100644
--- a/v1_apache-hop dash mapping/ratings/ratings.conscription_info.hpl	
+++ b/v1_apache-hop dash mapping/ratings/ratings.conscription_info.hpl	
@@ -169,7 +169,7 @@
     <limit>0</limit>
     <sql>WITH
 subpoena_data AS (
-	SELECT
+    SELECT
         s.id AS subpoena_id,
         s.create_date,
         s.department_id AS recruitment_id,
@@ -177,17 +177,17 @@ subpoena_data AS (
         sr.type,
         ssh.code AS sub_stat_hist,
         s.send_date,
-        sh.date_time::timestamp AS history_date,
-		ROW_NUMBER() OVER (PARTITION BY s.id ORDER BY sh.date_time DESC) AS rn
-	FROM public.subpoena s
-	JOIN subpoena_status ss ON s.status_id = ss.id
-	JOIN subpoena_reason AS sr ON sr.id = s.reason_id
-	JOIN subpoena_history AS sh ON sh.subpoena_id = s.id
-	JOIN subpoena_status AS ssh ON ssh.id = sh.status_id
-	WHERE ('${VK_ARRAY}' IS NULL
+        sh.date_time::timestamp AS history_date--,
+        --ROW_NUMBER() OVER (PARTITION BY s.id ORDER BY sh.date_time DESC) AS rn
+    FROM public.subpoena s
+    JOIN subpoena_status ss ON s.status_id = ss.id
+    JOIN subpoena_reason AS sr ON sr.id = s.reason_id
+    JOIN subpoena_history AS sh ON sh.subpoena_id = s.id
+    JOIN subpoena_status AS ssh ON ssh.id = sh.status_id
+    WHERE ('${VK_ARRAY}' IS NULL
         OR '${VK_ARRAY}' = '' 
         OR s.department_id = ANY (
-            	string_to_array(
+                string_to_array(
                 trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ','
             )::uuid[]
         )
@@ -201,11 +201,11 @@ subpoena_data AS (
         AND sh2.status_id = (SELECT id FROM subpoena_status WHERE code = '3')
     )
 ),
-last_status AS (
+/*last_status AS (
     SELECT *
     FROM subpoena_data
     WHERE rn = 1
-),
+),*/
 season_separations AS (
     SELECT distinct
         ls.recruitment_id,
@@ -217,15 +217,15 @@ season_separations AS (
             WHEN EXTRACT(MONTH FROM ls.create_date) BETWEEN 1 AND 6 THEN 'Весна'
             WHEN EXTRACT(MONTH FROM ls.create_date) BETWEEN 7 AND 12 THEN 'Осень'
         END AS spring_autumn
-    FROM last_status ls
+    FROM subpoena_data ls
     --WHERE ls.create_date >= DATE_TRUNC('year', CURRENT_DATE)
 )
 SELECT
-	'${REG_ID}' AS region_id,
+    '${REG_ID}' AS region_id,
     tt.spring_autumn,
-    COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('5')) AS appear_mil_com,
+    COUNT(distinct tt.subpoena_id) FILTER (WHERE tt.sub_stat_hist IN ('5')) AS appear_mil_com,
     ROUND(
-        COUNT(*) FILTER (WHERE tt.sub_stat_hist IN ('5'))::NUMERIC / NULLIF(COUNT(*), 0) * 100, 2
+        COUNT(distinct tt.subpoena_id) FILTER (WHERE tt.sub_stat_hist IN ('5'))::NUMERIC / NULLIF(COUNT(distinct tt.subpoena_id), 0) * 100, 2
     ) AS appear_mil_com_percent
 FROM season_separations tt
 group by tt.spring_autumn</sql>