fix restriction count

v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c).hpl

@@ -294,6 +294,8 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
+        rdi.status_applied,
         s.create_date,
         s.visit_date,
         s.department_id::uuid AS recruitment_id,
@@ -328,6 +330,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+              status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -360,6 +363,8 @@ subpoena_data AS (
 season_separations AS (
     SELECT distinct
         ls.recruitment_id,
+        ls.recruit_id,
+        ls.status_applied,
         ls.create_date,
         ls.visit_date,
         ls.sub_stat_hist,
@@ -464,18 +469,18 @@ t7 AS (
     SELECT
         ss.recruitment_id,
         ss.spring_autumn,
-    COUNT(DISTINCT ss.subpoena_id) AS count_restrictions_applied
+    COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM season_separations ss
-    WHERE restr_dc IS NULL
+    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ss.recruitment_id, ss.spring_autumn
 ),
 t8 AS (
     SELECT
         ss.recruitment_id,
         ss.spring_autumn,
-    COUNT(DISTINCT ss.subpoena_id) AS count_introduced_measures
+    COUNT(distinct recruit_id) AS count_introduced_measures
     FROM season_separations ss
-    WHERE restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ss.recruitment_id, ss.spring_autumn
 ),
 t9 AS (

v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c)/total_registered.subpoenas_pr1(m_c).hpl

@@ -207,6 +207,7 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
         s.department_id::uuid,
         s.status_id,
         (CASE 
@@ -220,6 +221,7 @@ subpoena_data AS (
         rdi.restriction_document_cancel_id AS restr_dc,
         rdi.applied_date AS ap_date,
         rdi.id AS rdi_id,
+        rdi.status_applied,
         ssi.delivery_code AS d_code,
         ssi.act_number,
         s.visit_date
@@ -245,6 +247,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+	        status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -354,7 +357,7 @@ t7 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_restrictions_applied
+        COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM subpoena_data ls
     WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ls.department_id, ls.mil_reg
@@ -363,9 +366,9 @@ t8 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_introduced_measures
+        COUNT(distinct recruit_id) AS count_introduced_measures
     FROM subpoena_data ls
-    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ls.department_id, ls.mil_reg
 ),
 t9 AS (

v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c)/total_registered.subpoenas_pr2(m_c).hpl

@@ -207,6 +207,7 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
         s.department_id::uuid,
         s.status_id,
         (CASE 
@@ -220,6 +221,7 @@ subpoena_data AS (
         rdi.restriction_document_cancel_id AS restr_dc,
         rdi.applied_date AS ap_date,
         rdi.id AS rdi_id,
+        rdi.status_applied,
         ssi.delivery_code AS d_code,
         ssi.act_number,
         s.visit_date
@@ -245,6 +247,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+	        status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -354,7 +357,7 @@ t7 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_restrictions_applied
+        COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM subpoena_data ls
     WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ls.department_id, ls.mil_reg
@@ -363,9 +366,9 @@ t8 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_introduced_measures
+        COUNT(distinct recruit_id) AS count_introduced_measures
     FROM subpoena_data ls
-    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ls.department_id, ls.mil_reg
 ),
 t9 AS (

v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c)/total_registered.subpoenas_pr3(m_c).hpl

@@ -207,6 +207,7 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
         s.department_id::uuid,
         s.status_id,
         (CASE 
@@ -220,6 +221,7 @@ subpoena_data AS (
         rdi.restriction_document_cancel_id AS restr_dc,
         rdi.applied_date AS ap_date,
         rdi.id AS rdi_id,
+        rdi.status_applied,
         ssi.delivery_code AS d_code,
         ssi.act_number,
         s.visit_date
@@ -245,6 +247,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+	        status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -354,7 +357,7 @@ t7 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_restrictions_applied
+        COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM subpoena_data ls
     WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ls.department_id, ls.mil_reg
@@ -363,9 +366,9 @@ t8 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_introduced_measures
+        COUNT(distinct recruit_id) AS count_introduced_measures
     FROM subpoena_data ls
-    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ls.department_id, ls.mil_reg
 ),
 t9 AS (

v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c)/total_registered.subpoenas_pr4(m_c).hpl

@@ -207,6 +207,7 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
         s.department_id::uuid,
         s.status_id,
         (CASE 
@@ -220,6 +221,7 @@ subpoena_data AS (
         rdi.restriction_document_cancel_id AS restr_dc,
         rdi.applied_date AS ap_date,
         rdi.id AS rdi_id,
+        rdi.status_applied,
         ssi.delivery_code AS d_code,
         ssi.act_number,
         s.visit_date
@@ -245,6 +247,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+	        status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -354,7 +357,7 @@ t7 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_restrictions_applied
+        COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM subpoena_data ls
     WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ls.department_id, ls.mil_reg
@@ -363,9 +366,9 @@ t8 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_introduced_measures
+        COUNT(distinct recruit_id) AS count_introduced_measures
     FROM subpoena_data ls
-    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ls.department_id, ls.mil_reg
 ),
 t9 AS (

v1_apache-hop dash mapping/mil_com/total_registered.subpoenas(m_c)/total_registered.subpoenas_pr5(m_c).hpl

@@ -207,6 +207,7 @@ ids AS (
 subpoena_data AS (
     SELECT
         s.id AS subpoena_id,
+        s.recruit_id,
         s.department_id::uuid,
         s.status_id,
         (CASE 
@@ -220,6 +221,7 @@ subpoena_data AS (
         rdi.restriction_document_cancel_id AS restr_dc,
         rdi.applied_date AS ap_date,
         rdi.id AS rdi_id,
+        rdi.status_applied,
         ssi.delivery_code AS d_code,
         ssi.act_number,
         s.visit_date
@@ -245,6 +247,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+	        status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -354,7 +357,7 @@ t7 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_restrictions_applied
+        COUNT(distinct recruit_id) AS count_restrictions_applied
     FROM subpoena_data ls
     WHERE rdi_id IS NOT NULL AND restr_dc IS NULL
     GROUP BY ls.department_id, ls.mil_reg
@@ -363,9 +366,9 @@ t8 AS (
     SELECT 
         ls.mil_reg,
         ls.department_id,
-        COUNT(rdi_id) AS count_introduced_measures
+        COUNT(distinct recruit_id) AS count_introduced_measures
     FROM subpoena_data ls
-    WHERE rdi_id IS NOT NULL AND restr_dc IS NULL AND ap_date IS NOT NULL
+    WHERE status_applied = '11'
     GROUP BY ls.department_id, ls.mil_reg
 ),
 t9 AS (