diff --git a/v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c)_uniq.hpl b/v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c)_uniq.hpl
index 8a02c90..85b1609 100644
--- a/v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c)_uniq.hpl	
+++ b/v1_apache-hop dash mapping/mil_com/recruitment_campaign.subpoenas(m_c)/recruitment_campaign.subpoenas(m_c)_uniq.hpl	
@@ -300,6 +300,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,
@@ -335,6 +337,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+              status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -364,8 +367,10 @@ subpoena_data AS (
         AND sh2.status_id = (SELECT id FROM subpoena_status WHERE code = '3')
     )
     UNION ALL 
-        SELECT
+    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,
@@ -401,6 +406,7 @@ subpoena_data AS (
 	    SELECT 
 	        restriction_document_create_id,
 	        restriction_document_cancel_id,
+              status_applied,
 	        applied_date,
 	        id
 	    FROM (
@@ -433,6 +439,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,
@@ -454,6 +462,8 @@ season_separations AS (
 
     SELECT distinct
         ls.recruitment_id,
+        ls.recruit_id,
+        ls.status_applied,
         ls.create_date,
         ls.visit_date,
         ls.sub_stat_hist,
@@ -547,18 +557,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 (