From f3b188dc79060177afc329ad1c25cb8e74785b0d Mon Sep 17 00:00:00 2001
From: Fusionshh <sabzeroifusion@gmail.com>
Date: Tue, 23 Sep 2025 15:59:25 +0300
Subject: [PATCH] Revert "ERVU-514 : medicine flow"

This reverts commit 31b1f6f2
---
 .../parallel/border_crossing_flow_delta.hpl}  | 366 ++++++++-------
 .../job_citizen_address.hwf}                  | 142 +++---
 .../recruitment_five_flow_delta.hpl           | 360 +++++++++++++++
 .../job_citizen_information_search.hwf}       | 164 +++----
 .../citizen_information_search_flow.hpl}      | 231 +++++-----
 ...itizen_information_search_flow_repeat.hpl} | 400 +++++++++--------
 .../job_spouse.hwf}                           | 137 +++---
 .../citizen_spouse/recruitments_five_flow.hpl | 356 +++++++++++++++
 .../recruitment_five_flow_delta.hpl}          | 282 ++++++------
 ...nt_decision_update_date_ervu_dashboard.hpl |  98 ++++
 .../recruitment_five_flow_delta.hpl}          | 375 ++++++++--------
 .../recruitment_five_flow_delta.hpl           | 360 +++++++++++++++
 .../disability/recruitment_five_flow.hpl      | 330 --------------
 .../recruitment_five_flow_delta.hpl           | 399 ----------------
 .../constants/health_state_constants_flow.hpl | 165 -------
 .../health_state/health_state_job.hwf         | 414 -----------------
 .../parallel/health_state_flow_delta.hpl      | 398 ----------------
 .../health_state/recruitment_five_flow.hpl    | 330 --------------
 .../recruitment_five_flow_delta.hpl           | 398 ----------------
 .../parallel/incapacity_flow_delta.hpl        | 418 -----------------
 .../recruitment_five_flow_delta.hpl           | 424 ------------------
 .../medicine/vich/recruitment_five_flow.hpl   | 330 --------------
 .../vich/recruitment_five_flow_delta.hpl      | 399 ----------------
 .../parallel/passport_flow.hpl}               | 189 ++++----
 .../parallel/passport_flow_delta.hpl}         | 295 ++++++------
 .../recruitment_five_flow_on_error.hpl}       |  97 ++--
 .../recruitments_five_flow.hpl}               |  97 ++--
 .../recruitment_five_flow_delta.hpl}          |  95 ++--
 .../recruitment_five_flow_delta.hpl           | 360 +++++++++++++++
 .../recruitment_five_flow_on_error.hpl        | 360 +++++++++++++++
 .../employer/recruitment_five_flow_repeat.hpl |  25 --
 .../support/check_if_need_to_repeat_job.hpl}  |  29 +-
 .../parallel/restriction_document_flow.hpl}   | 242 +++++-----
 .../restriction_document_flow_delta.hpl       | 408 +++++++++++++++++
 .../parallel/subpoena_appearance_flow.hpl}    | 158 +++----
 .../subpoena_appearance_flow_delta.hpl}       | 202 +++++----
 .../subpoena_appearance_flow_repeat.hpl}      | 210 +++++----
 .../subpoena_send_info_flow_delta.hpl}        | 205 ++++-----
 .../recruitment_five_flow_delta.hpl           | 360 +++++++++++++++
 .../recruit_archivation_reason.hpl}           | 145 +++---
 40 files changed, 4768 insertions(+), 5985 deletions(-)
 rename mappings/info_recruits/citizen_tables/{medicine/disability/parallel/disability_flow_delta.hpl => border_crossing/parallel/border_crossing_flow_delta.hpl} (67%)
 rename mappings/info_recruits/citizen_tables/{medicine/incapacity/incapacity_job.hwf => citizen_address/job_citizen_address.hwf} (72%)
 create mode 100644 mappings/info_recruits/citizen_tables/citizen_guardianship/recruitment_five_flow_delta.hpl
 rename mappings/info_recruits/citizen_tables/{medicine/disability/disability_job.hwf => citizen_information_search/job_citizen_information_search.hwf} (68%)
 rename mappings/info_recruits/citizen_tables/{medicine/disability/parallel/disability_flow.hpl => citizen_information_search/parallel/citizen_information_search_flow.hpl} (69%)
 rename mappings/info_recruits/citizen_tables/{medicine/disability/parallel/disability_flow_repeat.hpl => citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl} (66%)
 rename mappings/info_recruits/citizen_tables/{medicine/vich/vich_job.hwf => citizen_spouse/job_spouse.hwf} (72%)
 create mode 100644 mappings/info_recruits/citizen_tables/citizen_spouse/recruitments_five_flow.hpl
 rename mappings/info_recruits/citizen_tables/{medicine/incapacity/recruitment_five_flow_repeat.hpl => citizenship/recruitment_five_flow_delta.hpl} (86%)
 create mode 100644 mappings/info_recruits/citizen_tables/deferment_liberation/deferment_decision_update_date_ervu_dashboard.hpl
 rename mappings/info_recruits/citizen_tables/{medicine/vich/recruitment_five_flow_repeat.hpl => deferment_liberation/recruitment_five_flow_delta.hpl} (81%)
 create mode 100644 mappings/info_recruits/citizen_tables/drivers_licence/recruitment_five_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/health_state/health_state_job.hwf
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_delta.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow.hpl
 delete mode 100644 mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_delta.hpl
 rename mappings/info_recruits/citizen_tables/{medicine/incapacity/parallel/incapacity_flow.hpl => passport/parallel/passport_flow.hpl} (74%)
 rename mappings/info_recruits/citizen_tables/{medicine/vich/parallel/vich_flow_repeat.hpl => passport/parallel/passport_flow_delta.hpl} (72%)
 rename mappings/info_recruits/citizen_tables/{medicine/disability/recruitment_five_flow_repeat.hpl => passport/recruitment_five_flow_on_error.hpl} (83%)
 rename mappings/info_recruits/citizen_tables/{medicine/incapacity/recruitment_five_flow.hpl => passport/recruitments_five_flow.hpl} (84%)
 rename mappings/info_recruits/citizen_tables/{medicine/health_state/recruitment_five_flow_repeat.hpl => property/recruitment_five_flow_delta.hpl} (83%)
 create mode 100644 mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_delta.hpl
 create mode 100644 mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_on_error.hpl
 rename mappings/info_recruits/citizen_tables/{medicine/health_state/constants/support/check_if_constants_exists.hpl => work/work_activity/support/check_if_need_to_repeat_job.hpl} (70%)
 rename mappings/info_recruits/{citizen_tables/medicine/health_state/parallel/health_state_flow.hpl => raw_data/restriction_document/parallel/restriction_document_flow.hpl} (65%)
 create mode 100644 mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl
 rename mappings/info_recruits/{citizen_tables/medicine/vich/parallel/vich_flow.hpl => raw_data/subpoena_appearance/parallel/subpoena_appearance_flow.hpl} (74%)
 rename mappings/info_recruits/{citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl => raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_delta.hpl} (72%)
 rename mappings/info_recruits/{citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl => raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_repeat.hpl} (71%)
 rename mappings/info_recruits/{citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl => raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl} (68%)
 create mode 100644 mappings/info_recruits/raw_data/subpoena_send_info/recruitment_five_flow_delta.hpl
 rename mappings/info_recruits/{citizen_tables/medicine/health_state/constants/health_state_constants_flow_repeat.hpl => reference_data/recruit_archivation_reason.hpl} (55%)

diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl b/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl
similarity index 67%
rename from mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl
rename to mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl
index 611a7d9..b3924d1 100644
--- a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>disability_flow_delta</name>
+    <name>border_crossing_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,46 +13,16 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:36:38.686</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:36:38.686</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Create job execution record</from>
-      <to>disability_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>disability_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_upsert</from>
-      <to>Change job status on error</to>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -61,17 +31,57 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>disability_upsert</from>
-      <to>has_disability_update</to>
+      <from>Filter rows</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Change job status on error</from>
+      <to>Abort</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Group by</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>User defined Java expression</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>User defined Java expression</from>
+      <to>Update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Group by</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Update</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Update</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
       <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
@@ -87,13 +97,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1936</xloc>
-      <yloc>560</yloc>
+      <xloc>1392</xloc>
+      <yloc>528</yloc>
     </GUI>
   </transform>
   <transform>
@@ -127,8 +137,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1712</xloc>
-      <yloc>560</yloc>
+      <xloc>1392</xloc>
+      <yloc>352</yloc>
     </GUI>
   </transform>
   <transform>
@@ -158,7 +168,7 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1936</xloc>
+      <xloc>1872</xloc>
       <yloc>208</yloc>
     </GUI>
   </transform>
@@ -184,14 +194,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution  
 SET
     status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
+    execution_datetime = DEFAULT,
     error_description = NULL
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>816</xloc>
-      <yloc>384</yloc>
+      <xloc>352</xloc>
+      <yloc>352</yloc>
     </GUI>
   </transform>
   <transform>
@@ -207,7 +217,7 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>1232</xloc>
+      <xloc>1632</xloc>
       <yloc>208</yloc>
     </GUI>
   </transform>
@@ -243,15 +253,50 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1936</xloc>
-      <yloc>384</yloc>
+      <xloc>1632</xloc>
+      <yloc>320</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Group by</name>
+    <type>GroupBy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <add_linenr>N</add_linenr>
+    <all_rows>N</all_rows>
+    <directory>${java.io.tmpdir}</directory>
+    <fields>
+      <field>
+        <aggregate>border_crossed_raw</aggregate>
+        <subject>is_border_crossed</subject>
+        <type>MAX</type>
+      </field>
+    </fields>
+    <give_back_row>N</give_back_row>
+    <group>
+      <field>
+        <name>recruit_id</name>
+      </field>
+    </group>
+    <ignore_aggregate>N</ignore_aggregate>
+    <prefix>grp</prefix>
+    <attributes/>
+    <GUI>
+      <xloc>752</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -261,12 +306,56 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>1232</xloc>
-      <yloc>384</yloc>
+      <xloc>944</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_input</name>
+    <name>Insert / update</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>100</commit>
+    <connection>ervu-dashboard</connection>
+    <lookup>
+      <key>
+        <condition>=</condition>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
+      </key>
+      <schema>ervu_dashboard</schema>
+      <table>border_crossing</table>
+      <value>
+        <name>recruit_id</name>
+        <rename>recruit_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>date_crossing</name>
+        <rename>date_crossing</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>return_date</name>
+        <rename>return_date</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+    <update_bypassed>N</update_bypassed>
+    <attributes/>
+    <GUI>
+      <xloc>752</xloc>
+      <yloc>352</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -278,159 +367,94 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' AS invalid_elem
-                      FROM recruits_info ri
-                      WHERE ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' &lt;&gt; 'null'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        and to_date(ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-)
-SELECT fd.recruit_id,
-       invalid_elem ->> 'id'                               AS source_id,
-       to_date(invalid_elem ->> 'dataSved', 'YYYY-MM-DD') as source_update_date,
-       invalid_elem ->> 'gruppa' as disability_group,
-       invalid_elem ->> 'ustanOrg' as disability_establish_org_name,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataUstan', 'YYYY-MM-DD') as register_date,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataPodtverzhdPlan', 'YYYY-MM-DD') as confirmation_date,
-       to_date(invalid_elem ->> 'dataSnyat', 'YYYY-MM-DD') as deregistration_date,
-       coalesce(invalid_elem -> 'ustanInvalid' ->> 'prBessrInvl' = '1', false) as permanent
-FROM filteredData fd;</sql>
+    <limit/>
+    <sql>SELECT
+    recruit_id,
+    (string_agg(elem->>'dataVyezd', ', '))::date as date_crossing,
+    (string_agg(elem->>'dataVozvrashh', ', '))::date as return_date,
+  1 as border_crossed
+FROM ervu_dashboard.recruits_info ri
+JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+    AND ri.updated_at >= '${M_R_UP_DATE}'::timestamp,
+LATERAL jsonb_array_elements(info->'svedFL'->'extend'->'svedPeresechGran') as elem
+WHERE jsonb_typeof(info->'svedFL'->'extend'->'svedPeresechGran') = 'array'
+  AND (elem->>'dataVyezd' IS NOT NULL OR elem->>'dataVozvrashh' IS NOT NULL)
+GROUP BY recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>1040</xloc>
-      <yloc>384</yloc>
+      <xloc>560</xloc>
+      <yloc>352</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>disability</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>disability_group</name>
-        <rename>disability_group</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>disability_establish_org_name</name>
-        <rename>disability_establish_org_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>confirmation_date</name>
-        <rename>confirmation_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>permanent</name>
-        <rename>permanent</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>last_row</name>
-        <rename>last_row</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>1520</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>has_disability_update</name>
+    <name>Update</name>
     <type>Update</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
-    <ignore_flag_field/>
+    <error_ignored>Y</error_ignored>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
-        <name2/>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>has_disability</field>
-        <name>has_disability</name>
-        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
       <value>
-        <name>has_disability</name>
-        <rename>has_disability</rename>
+        <name>border_crossed</name>
+        <rename>border_crossed</rename>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>1712</xloc>
-      <yloc>384</yloc>
+      <xloc>1392</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>User defined Java expression</name>
+    <type>Janino</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <formula>
+      <field_name>border_crossed</field_name>
+      <formula_string>border_crossed_raw == 1</formula_string>
+      <value_type>Boolean</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <replace_field/>
+    </formula>
+    <attributes/>
+    <GUI>
+      <xloc>1168</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>disability_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename/>
       <fields_valuename/>
       <codes_valuename/>
       <max_errors/>
@@ -438,7 +462,7 @@ FROM filteredData fd;</sql>
       <min_pct_rows/>
     </error>
     <error>
-      <source_transform>has_disability_update</source_transform>
+      <source_transform>Update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/incapacity_job.hwf b/mappings/info_recruits/citizen_tables/citizen_address/job_citizen_address.hwf
similarity index 72%
rename from mappings/info_recruits/citizen_tables/medicine/incapacity/incapacity_job.hwf
rename to mappings/info_recruits/citizen_tables/citizen_address/job_citizen_address.hwf
index 0f4eaf4..495a2c2 100644
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/incapacity_job.hwf
+++ b/mappings/info_recruits/citizen_tables/citizen_address/job_citizen_address.hwf
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workflow>
-  <name>incapacity_job</name>
+  <name>job_citizen_address</name>
   <name_sync_with_filename>Y</name_sync_with_filename>
   <description/>
   <extended_description/>
   <workflow_version/>
+  <workflow_status>0</workflow_status>
   <created_user>-</created_user>
-  <created_date>2025/09/08 16:38:17.982</created_date>
+  <created_date>2025/06/05 14:27:15.055</created_date>
   <modified_user>-</modified_user>
-  <modified_date>2025/09/08 16:38:17.982</modified_date>
+  <modified_date>2025/06/05 14:27:15.055</modified_date>
   <parameters>
-    </parameters>
+    <parameter>
+      <name>M_R_CR_DATE</name>
+      <default_value>3001-01-01 00:00:00</default_value>
+      <description/>
+    </parameter>
+    <parameter>
+      <name>M_R_UP_DATE</name>
+      <default_value/>
+      <description/>
+    </parameter>
+  </parameters>
   <actions>
     <action>
       <name>Start</name>
@@ -26,12 +37,12 @@
       <schedulerType>0</schedulerType>
       <weekDay>1</weekDay>
       <parallel>N</parallel>
-      <xloc>96</xloc>
-      <yloc>160</yloc>
+      <xloc>416</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_job_execution_exists.hpl</name>
+      <name>check_if_citizen_address_job_exists.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -41,7 +52,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_address/checkpoints/check_if_citizen_address_job_exists.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -52,12 +63,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>480</xloc>
-      <yloc>160</yloc>
+      <xloc>608</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>employer_job_execution_exists_check</name>
+      <name>citizen_address_job_exists_check</name>
       <description/>
       <type>SIMPLE_EVAL</type>
       <attributes/>
@@ -69,12 +80,12 @@
       <valuetype>variable</valuetype>
       <variablename>JOB_EXECUTED_FLAG</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>160</yloc>
+      <xloc>880</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow.hpl</name>
+      <name>recruitments_five_flow.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -84,7 +95,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_address/recruitments_five_flow.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -95,12 +106,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>Y</parallel>
-      <xloc>1104</xloc>
-      <yloc>160</yloc>
+      <xloc>1120</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
+      <name>recruitment_five_flow_on_error.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -110,7 +121,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_repeat.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_address/recruitment_five_flow_on_error.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -121,12 +132,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>1040</xloc>
-      <yloc>464</yloc>
+      <xloc>1120</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_need_to_repeat.hpl</name>
+      <name>check_if_need_to_repeat_job.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -136,9 +147,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
-      <logext/>
-      <logfile/>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_address/check_if_need_to_repeat_job.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -149,8 +158,8 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>304</yloc>
+      <xloc>880</xloc>
+      <yloc>368</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -158,7 +167,12 @@
       <description/>
       <type>SIMPLE_EVAL</type>
       <attributes/>
+      <comparevalue/>
+      <fieldname/>
       <fieldtype>boolean</fieldtype>
+      <mask/>
+      <maxvalue/>
+      <minvalue/>
       <successbooleancondition>true</successbooleancondition>
       <successcondition>equal</successcondition>
       <successnumbercondition>equal</successnumbercondition>
@@ -166,8 +180,8 @@
       <valuetype>variable</valuetype>
       <variablename>NEED_TO_REPEAT_JOB</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>464</yloc>
+      <xloc>880</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -181,7 +195,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_delta.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_address/recruitment_five_flow_delta.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -192,62 +206,50 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
+      <xloc>880</xloc>
       <yloc>704</yloc>
       <attributes_hac/>
     </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>incapacity_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>256</xloc>
-      <yloc>160</yloc>
-      <attributes_hac/>
-    </action>
   </actions>
   <hops>
     <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
+      <from>Start</from>
+      <to>check_if_citizen_address_job_exists.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>check_if_citizen_address_job_exists.hpl</from>
+      <to>citizen_address_job_exists_check</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
+      <from>citizen_address_job_exists_check</from>
+      <to>recruitments_five_flow.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>citizen_address_job_exists_check</from>
+      <to>check_if_need_to_repeat_job.hpl</to>
       <enabled>Y</enabled>
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>check_if_need_to_repeat.hpl</from>
+      <from>check_if_need_to_repeat_job.hpl</from>
       <to>Simple evaluation</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
+      <to>recruitment_five_flow_on_error.hpl</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
@@ -259,20 +261,6 @@
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>Start</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/mappings/info_recruits/citizen_tables/citizen_guardianship/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_guardianship/recruitment_five_flow_delta.hpl
new file mode 100644
index 0000000..034d7b5
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/citizen_guardianship/recruitment_five_flow_delta.hpl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitment_five_flow_delta</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/11 13:16:11.204</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>citizen_guardianship_flow_delta.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>citizen_guardianship_flow_delta.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>citizen_guardianship_flow_delta.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>citizen_guardianship_flow_delta.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>citizen_guardianship_flow_delta.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit>0</limit>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'citizen_guardianship_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_guardianship_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_guardianship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_guardianship_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_guardianship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_guardianship_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_guardianship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_guardianship_flow_delta.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_guardianship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_guardianship_flow_delta.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_guardianship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>448</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/disability_job.hwf b/mappings/info_recruits/citizen_tables/citizen_information_search/job_citizen_information_search.hwf
similarity index 68%
rename from mappings/info_recruits/citizen_tables/medicine/disability/disability_job.hwf
rename to mappings/info_recruits/citizen_tables/citizen_information_search/job_citizen_information_search.hwf
index 704af69..79f22b2 100644
--- a/mappings/info_recruits/citizen_tables/medicine/disability/disability_job.hwf
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/job_citizen_information_search.hwf
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workflow>
-  <name>disability_job</name>
+  <name>job_citizen_information_search</name>
   <name_sync_with_filename>Y</name_sync_with_filename>
   <description/>
   <extended_description/>
   <workflow_version/>
+  <workflow_status>0</workflow_status>
   <created_user>-</created_user>
-  <created_date>2025/09/08 16:38:17.982</created_date>
+  <created_date>2025/06/05 14:27:15.055</created_date>
   <modified_user>-</modified_user>
-  <modified_date>2025/09/08 16:38:17.982</modified_date>
+  <modified_date>2025/06/05 14:27:15.055</modified_date>
   <parameters>
-    </parameters>
+    <parameter>
+      <name>M_R_CR_DATE</name>
+      <default_value>3001-01-01 00:00:00</default_value>
+      <description/>
+    </parameter>
+    <parameter>
+      <name>M_R_UP_DATE</name>
+      <default_value/>
+      <description/>
+    </parameter>
+  </parameters>
   <actions>
     <action>
       <name>Start</name>
@@ -26,12 +37,12 @@
       <schedulerType>0</schedulerType>
       <weekDay>1</weekDay>
       <parallel>N</parallel>
-      <xloc>112</xloc>
-      <yloc>160</yloc>
+      <xloc>416</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_job_execution_exists.hpl</name>
+      <name>check_if_citizen_information_search_job_exists.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -41,7 +52,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/support/check_if_job_execution_exists.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_information_search/checkpoints/check_if_citizen_information_search_job_exists.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -52,12 +63,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>480</xloc>
-      <yloc>160</yloc>
+      <xloc>608</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>employer_job_execution_exists_check</name>
+      <name>citizen_information_search_job_exists_check</name>
       <description/>
       <type>SIMPLE_EVAL</type>
       <attributes/>
@@ -69,12 +80,12 @@
       <valuetype>variable</valuetype>
       <variablename>JOB_EXECUTED_FLAG</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>160</yloc>
+      <xloc>880</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow.hpl</name>
+      <name>recruitments_five_flow.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -84,7 +95,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_information_search/recruitments_five_flow.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -95,12 +106,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>Y</parallel>
-      <xloc>1104</xloc>
-      <yloc>160</yloc>
+      <xloc>1120</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
+      <name>recruitment_five_flow_on_error.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -110,7 +121,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_repeat.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_information_search/recruitment_five_flow_on_error.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -121,12 +132,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>1040</xloc>
-      <yloc>464</yloc>
+      <xloc>1120</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_need_to_repeat.hpl</name>
+      <name>check_if_need_to_repeat_job.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -136,7 +147,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/support/check_if_need_to_repeat.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_information_search/check_if_need_to_repeat_job.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -147,8 +158,8 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>304</yloc>
+      <xloc>880</xloc>
+      <yloc>368</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -164,8 +175,8 @@
       <valuetype>variable</valuetype>
       <variablename>NEED_TO_REPEAT_JOB</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>464</yloc>
+      <xloc>880</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -179,7 +190,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_delta.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_information_search/recruitment_five_flow_delta.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -190,63 +201,50 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
+      <xloc>880</xloc>
       <yloc>704</yloc>
       <attributes_hac/>
     </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>disability_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <filename/>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>272</xloc>
-      <yloc>160</yloc>
-      <attributes_hac/>
-    </action>
   </actions>
   <hops>
     <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
+      <from>Start</from>
+      <to>check_if_citizen_information_search_job_exists.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>check_if_citizen_information_search_job_exists.hpl</from>
+      <to>citizen_information_search_job_exists_check</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
+      <from>citizen_information_search_job_exists_check</from>
+      <to>recruitments_five_flow.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>citizen_information_search_job_exists_check</from>
+      <to>check_if_need_to_repeat_job.hpl</to>
       <enabled>Y</enabled>
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>check_if_need_to_repeat.hpl</from>
+      <from>check_if_need_to_repeat_job.hpl</from>
       <to>Simple evaluation</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
+      <to>recruitment_five_flow_on_error.hpl</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
@@ -258,22 +256,36 @@
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>Start</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
   </hops>
   <notepads>
+    <notepad>
+      <backgroundcolorblue>251</backgroundcolorblue>
+      <backgroundcolorgreen>232</backgroundcolorgreen>
+      <backgroundcolorred>201</backgroundcolorred>
+      <bordercolorblue>90</bordercolorblue>
+      <bordercolorgreen>58</bordercolorgreen>
+      <bordercolorred>14</bordercolorred>
+      <fontbold>N</fontbold>
+      <fontcolorblue>90</fontcolorblue>
+      <fontcolorgreen>58</fontcolorgreen>
+      <fontcolorred>14</fontcolorred>
+      <fontitalic>N</fontitalic>
+      <fontname>Segoe UI</fontname>
+      <fontsize>9</fontsize>
+      <height>149</height>
+      <xloc>976</xloc>
+      <yloc>0</yloc>
+      <note>
+
+M_R_UP_DATE
+
+M_R_CR_DATE
+
+0001-01-01 00:00:00
+
+3001-01-01 00:00:00</note>
+      <width>114</width>
+    </notepad>
   </notepads>
   <attributes/>
 </workflow>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
similarity index 69%
rename from mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl
rename to mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
index c0ed99b..a511083 100644
--- a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>disability_flow</name>
+    <name>citizen_information_search_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,26 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:20.455</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:20.455</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>disability_input</to>
+      <from>Table output</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,45 +41,45 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
+      <from>Table output</from>
       <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>disability_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Detect empty stream</from>
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>disability_output</from>
-      <to>has_disability_update</to>
+      <from>Table input</from>
+      <to>Table output</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Identify last row in a stream</from>
+      <to>Add constants</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Add constants</from>
+      <to>Update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Update</from>
       <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -87,13 +92,40 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>576</yloc>
+      <xloc>1168</xloc>
+      <yloc>448</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Add constants</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <length>-1</length>
+        <name>is_wanted</name>
+        <nullif>true</nullif>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+        <type>Boolean</type>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>880</xloc>
+      <yloc>624</yloc>
     </GUI>
   </transform>
   <transform>
@@ -127,8 +159,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>576</yloc>
+      <xloc>1008</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform>
@@ -153,13 +185,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>240</yloc>
+      <xloc>1488</xloc>
+      <yloc>624</yloc>
     </GUI>
   </transform>
   <transform>
@@ -187,8 +220,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
 </sql>
     <attributes/>
     <GUI>
-      <xloc>288</xloc>
-      <yloc>416</yloc>
+      <xloc>80</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -204,8 +237,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>240</yloc>
+      <xloc>1488</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -240,15 +273,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>416</yloc>
+      <xloc>1200</xloc>
+      <yloc>624</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -258,12 +291,12 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>416</yloc>
+      <xloc>720</xloc>
+      <yloc>624</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -275,43 +308,41 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' AS invalid_elem
-                      FROM recruits_info ri
-                      WHERE ri.info -> 'svedFL' -> 'svedInvalid' ->> 'invalid' &lt;&gt; 'null'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       invalid_elem ->> 'id'                               AS source_id,
-       to_date(invalid_elem ->> 'dataSved', 'YYYY-MM-DD') as source_update_date,
-       invalid_elem ->> 'gruppa' as disability_group,
-       invalid_elem ->> 'ustanOrg' as disability_establish_org_name,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataUstan', 'YYYY-MM-DD') as register_date,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataPodtverzhdPlan', 'YYYY-MM-DD') as confirmation_date,
-       to_date(invalid_elem ->> 'dataSnyat', 'YYYY-MM-DD') as deregistration_date,
-       coalesce(invalid_elem -> 'ustanInvalid' ->> 'prBessrInvl' = '1', false) as permanent,
-	true as has_disability
-FROM filteredData fd;</sql>
+    <sql>
+SELECT
+    ri.recruit_id,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'naimOrg' AS name_organ_start_search,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'ugolovZakon' AS article_criminal_code,
+    TO_DATE(ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'dataNachRozisk', 'YYYY-MM-DD') AS wanted_start_date,
+    TO_DATE(ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'dataPrekrRozysk', 'YYYY-MM-DD') AS wanted_end_date,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'osnovPrekrRozysk' AS grounds_stopping_search,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'naimOrgPrekrRozysk' AS name_organ_end_search
+FROM recruits_info ri
+ JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id 
+WHERE'${IDM_ID}' != ''
+     AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+     AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
+     AND jsonb_typeof(ri.info->'svedFL'->'extend'->'rozysk') = 'object'
+</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>512</xloc>
-      <yloc>416</yloc>
+      <xloc>336</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_output</name>
+    <name>Table output</name>
     <type>TableOutput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <fields>
       <field>
@@ -319,36 +350,28 @@ FROM filteredData fd;</sql>
         <stream_name>recruit_id</stream_name>
       </field>
       <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
+        <column_name>name_organ_start_search</column_name>
+        <stream_name>name_organ_start_search</stream_name>
       </field>
       <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
+        <column_name>article_criminal_code</column_name>
+        <stream_name>article_criminal_code</stream_name>
       </field>
       <field>
-        <column_name>disability_group</column_name>
-        <stream_name>disability_group</stream_name>
+        <column_name>wanted_start_date</column_name>
+        <stream_name>wanted_start_date</stream_name>
       </field>
       <field>
-        <column_name>disability_establish_org_name</column_name>
-        <stream_name>disability_establish_org_name</stream_name>
+        <column_name>wanted_end_date</column_name>
+        <stream_name>wanted_end_date</stream_name>
       </field>
       <field>
-        <column_name>register_date</column_name>
-        <stream_name>register_date</stream_name>
+        <column_name>grounds_stopping_search</column_name>
+        <stream_name>grounds_stopping_search</stream_name>
       </field>
       <field>
-        <column_name>confirmation_date</column_name>
-        <stream_name>confirmation_date</stream_name>
-      </field>
-      <field>
-        <column_name>deregistration_date</column_name>
-        <stream_name>deregistration_date</stream_name>
-      </field>
-      <field>
-        <column_name>permanent</column_name>
-        <stream_name>permanent</stream_name>
+        <column_name>name_organ_end_search</column_name>
+        <stream_name>name_organ_end_search</stream_name>
       </field>
     </fields>
     <ignore_errors>N</ignore_errors>
@@ -359,29 +382,29 @@ FROM filteredData fd;</sql>
     <return_keys>N</return_keys>
     <schema>ervu_dashboard</schema>
     <specify_fields>Y</specify_fields>
-    <table>disability</table>
+    <table>citizen_information_search</table>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
     <truncate>N</truncate>
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>992</xloc>
-      <yloc>416</yloc>
+      <xloc>720</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>has_disability_update</name>
+    <name>Update</name>
     <type>Update</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>N</error_ignored>
     <ignore_flag_field/>
@@ -395,39 +418,39 @@ FROM filteredData fd;</sql>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
       <value>
-        <name>has_disability</name>
-        <rename>has_disability</rename>
+        <name>is_wanted</name>
+        <rename>is_wanted</rename>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>Y</use_batch>
+    <use_batch>N</use_batch>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>416</yloc>
+      <xloc>1008</xloc>
+      <yloc>624</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>disability_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
     </error>
     <error>
-      <source_transform>has_disability_update</source_transform>
+      <source_transform>Update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename>error_decription</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
similarity index 66%
rename from mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
index 92e4e86..92f0032 100644
--- a/mappings/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>disability_flow_repeat</name>
+    <name>citizen_information_search_flow_repeat</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,68 +13,73 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:32:10.265</created_date>
+    <created_date>2025/08/08 13:25:52.319</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:32:10.265</modified_date>
+    <modified_date>2025/08/08 13:25:52.319</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
+    <hop>
+      <from>Create job execution record</from>
+      <to>Table input</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Add constants</from>
+      <to>Update</to>
+      <enabled>Y</enabled>
+    </hop>
     <hop>
       <from>Change job status on error</from>
       <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>disability_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>disability_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disability_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Detect empty stream</from>
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>disability_upsert</from>
-      <to>has_disability_update</to>
+      <from>Filter rows</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Identify last row in a stream 2</from>
+      <to>Add constants</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Update</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_disability_update</from>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
       <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Identify last row in a stream 2</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -87,13 +92,40 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>592</yloc>
+      <xloc>1152</xloc>
+      <yloc>432</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Add constants</name>
+    <type>Constant</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <length>-1</length>
+        <name>is_wanted</name>
+        <nullif>true</nullif>
+        <precision>-1</precision>
+        <set_empty_string>N</set_empty_string>
+        <type>Boolean</type>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>880</xloc>
+      <yloc>640</yloc>
     </GUI>
   </transform>
   <transform>
@@ -127,8 +159,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1120</xloc>
-      <yloc>592</yloc>
+      <xloc>992</xloc>
+      <yloc>432</yloc>
     </GUI>
   </transform>
   <transform>
@@ -153,13 +185,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>256</yloc>
+      <xloc>1312</xloc>
+      <yloc>640</yloc>
     </GUI>
   </transform>
   <transform>
@@ -181,17 +214,31 @@ and recruitment_id = '${IDM_ID}';
     <replace_variables>Y</replace_variables>
     <set_params>N</set_params>
     <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
+    <sql>INSERT INTO etl.job_execution (
+    id,
+    job_name,
+    status,
+    execution_datetime,
+    error_description,
+    recruitment_id
+)
+VALUES (
+    DEFAULT,
+    '${JOB_NAME}',
+    'PROCESSING',
+    DEFAULT,
+    NULL,
+    '${IDM_ID}'
+)
+ON CONFLICT (job_name, recruitment_id)
+DO UPDATE SET
     status = 'PROCESSING',
-    execution_datetime = current_timestamp,
-    error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
+    execution_datetime = DEFAULT,
+    error_description = NULL;</sql>
     <attributes/>
     <GUI>
-      <xloc>416</xloc>
-      <yloc>432</yloc>
+      <xloc>176</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
@@ -207,8 +254,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>256</yloc>
+      <xloc>1312</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
@@ -243,15 +290,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>432</yloc>
+      <xloc>1136</xloc>
+      <yloc>640</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>Identify last row in a stream</name>
+    <name>Identify last row in a stream 2</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -261,12 +308,76 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>432</yloc>
+      <xloc>688</xloc>
+      <yloc>640</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_input</name>
+    <name>Insert / update</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>1000</commit>
+    <connection>ervu-dashboard</connection>
+    <lookup>
+      <key>
+        <condition>=</condition>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
+      </key>
+      <schema>ervu_dashboard</schema>
+      <table>citizen_information_search</table>
+      <value>
+        <name>recruit_id</name>
+        <rename>recruit_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>name_organ_start_search</name>
+        <rename>name_organ_start_search</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>article_criminal_code</name>
+        <rename>article_criminal_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>wanted_start_date</name>
+        <rename>wanted_start_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>wanted_end_date</name>
+        <rename>wanted_end_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>grounds_stopping_search</name>
+        <rename>grounds_stopping_search</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>name_organ_end_search</name>
+        <rename>name_organ_end_search</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+    <update_bypassed>N</update_bypassed>
+    <attributes/>
+    <GUI>
+      <xloc>688</xloc>
+      <yloc>272</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -278,154 +389,79 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' AS invalid_elem
-                      FROM recruits_info ri
-                      WHERE ri.info -> 'svedFL' -> 'svedInvalid' -> 'invalid' &lt;&gt; 'null'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       invalid_elem ->> 'id'                               AS source_id,
-       to_date(invalid_elem ->> 'dataSved', 'YYYY-MM-DD') as source_update_date,
-       invalid_elem ->> 'gruppa' as disability_group,
-       invalid_elem ->> 'ustanOrg' as disability_establish_org_name,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataUstan', 'YYYY-MM-DD') as register_date,
-       to_date(invalid_elem -> 'ustanInvalid' ->> 'dataPodtverzhdPlan', 'YYYY-MM-DD') as confirmation_date,
-       to_date(invalid_elem ->> 'dataSnyat', 'YYYY-MM-DD') as deregistration_date,
-       coalesce(invalid_elem -> 'ustanInvalid' ->> 'prBessrInvl' = '1', false) as permanent
-FROM filteredData fd;</sql>
+    <sql>
+SELECT
+    ri.recruit_id,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'naimOrg' AS name_organ_start_search,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'ugolovZakon' AS article_criminal_code,
+    TO_DATE(ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'dataNachRozisk', 'YYYY-MM-DD') AS wanted_start_date,
+    TO_DATE(ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'dataPrekrRozysk', 'YYYY-MM-DD') AS wanted_end_date,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'osnovPrekrRozysk' AS grounds_stopping_search,
+    ri.info -> 'svedFL' -> 'extend' -> 'rozysk' ->> 'naimOrgPrekrRozysk' AS name_organ_end_search
+FROM recruits_info ri
+ JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id 
+WHERE'${IDM_ID}' != ''
+     AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+     AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
+     AND jsonb_typeof(ri.info->'svedFL'->'extend'->'rozysk') = 'object'
+</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>432</yloc>
+      <xloc>416</xloc>
+      <yloc>272</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>disability</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>disability_group</name>
-        <rename>disability_group</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>disability_establish_org_name</name>
-        <rename>disability_establish_org_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>confirmation_date</name>
-        <rename>confirmation_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>permanent</name>
-        <rename>permanent</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>last_row</name>
-        <rename>last_row</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>1120</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>has_disability_update</name>
+    <name>Update</name>
     <type>Update</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>N</error_ignored>
-    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
-        <name2/>
-      </key>
-      <key>
-        <condition>&lt;></condition>
-        <field>has_disability</field>
-        <name>has_disability</name>
-        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
       <value>
-        <name>has_disability</name>
-        <rename>has_disability</rename>
+        <name>is_wanted</name>
+        <rename>is_wanted</rename>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>Y</use_batch>
+    <use_batch>N</use_batch>
     <attributes/>
     <GUI>
-      <xloc>1312</xloc>
-      <yloc>432</yloc>
+      <xloc>992</xloc>
+      <yloc>640</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>disability_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
+      <target_transform>Change job status on error</target_transform>
+      <is_enabled>Y</is_enabled>
+      <nr_valuename/>
+      <descriptions_valuename>error_description</descriptions_valuename>
+      <fields_valuename/>
+      <codes_valuename>error_code</codes_valuename>
+      <max_errors/>
+      <max_pct_errors/>
+      <min_pct_rows/>
+    </error>
+    <error>
+      <source_transform>Update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
@@ -436,18 +472,6 @@ FROM filteredData fd;</sql>
       <max_pct_errors/>
       <min_pct_rows/>
     </error>
-    <error>
-      <source_transform>has_disability_update</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename/>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
   </transform_error_handling>
   <attributes/>
 </pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/vich_job.hwf b/mappings/info_recruits/citizen_tables/citizen_spouse/job_spouse.hwf
similarity index 72%
rename from mappings/info_recruits/citizen_tables/medicine/vich/vich_job.hwf
rename to mappings/info_recruits/citizen_tables/citizen_spouse/job_spouse.hwf
index b784620..52a8cd1 100644
--- a/mappings/info_recruits/citizen_tables/medicine/vich/vich_job.hwf
+++ b/mappings/info_recruits/citizen_tables/citizen_spouse/job_spouse.hwf
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workflow>
-  <name>vich_job</name>
+  <name>job_citizen_spouse</name>
   <name_sync_with_filename>Y</name_sync_with_filename>
   <description/>
   <extended_description/>
   <workflow_version/>
+  <workflow_status>0</workflow_status>
   <created_user>-</created_user>
-  <created_date>2025/09/08 16:38:17.982</created_date>
+  <created_date>2025/06/05 14:27:15.055</created_date>
   <modified_user>-</modified_user>
-  <modified_date>2025/09/08 16:38:17.982</modified_date>
+  <modified_date>2025/06/05 14:27:15.055</modified_date>
   <parameters>
-    </parameters>
+    <parameter>
+      <name>M_R_CR_DATE</name>
+      <default_value>3001-01-01 00:00:00</default_value>
+      <description/>
+    </parameter>
+    <parameter>
+      <name>M_R_UP_DATE</name>
+      <default_value/>
+      <description/>
+    </parameter>
+  </parameters>
   <actions>
     <action>
       <name>Start</name>
@@ -26,12 +37,12 @@
       <schedulerType>0</schedulerType>
       <weekDay>1</weekDay>
       <parallel>N</parallel>
-      <xloc>128</xloc>
-      <yloc>160</yloc>
+      <xloc>416</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_job_execution_exists.hpl</name>
+      <name>check_if_citizen_spouse_job_exists.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -41,7 +52,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/checkpoints/check_if_citizen_spouse_job_exists.hpl</filename>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -52,12 +63,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>480</xloc>
-      <yloc>160</yloc>
+      <xloc>608</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>employer_job_execution_exists_check</name>
+      <name>citizen_spouse_job_exists_check</name>
       <description/>
       <type>SIMPLE_EVAL</type>
       <attributes/>
@@ -69,12 +80,12 @@
       <valuetype>variable</valuetype>
       <variablename>JOB_EXECUTED_FLAG</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>160</yloc>
+      <xloc>880</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow.hpl</name>
+      <name>recruitments_five_flow.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -84,7 +95,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/recruitments_five_flow.hpl</filename>
       <logext/>
       <logfile/>
       <loglevel>Basic</loglevel>
@@ -97,12 +108,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>Y</parallel>
-      <xloc>1104</xloc>
-      <yloc>160</yloc>
+      <xloc>1120</xloc>
+      <yloc>208</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
+      <name>recruitment_five_flow_on_error.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -112,7 +123,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_repeat.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/recruitment_five_flow_on_error.hpl</filename>
       <logext/>
       <logfile/>
       <loglevel>Basic</loglevel>
@@ -125,12 +136,12 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>1040</xloc>
-      <yloc>464</yloc>
+      <xloc>1120</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>check_if_need_to_repeat.hpl</name>
+      <name>check_if_need_to_repeat_job.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -140,7 +151,9 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/check_if_need_to_repeat_job.hpl</filename>
+      <logext/>
+      <logfile/>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -151,8 +164,8 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>304</yloc>
+      <xloc>880</xloc>
+      <yloc>368</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -168,8 +181,8 @@
       <valuetype>variable</valuetype>
       <variablename>NEED_TO_REPEAT_JOB</variablename>
       <parallel>N</parallel>
-      <xloc>784</xloc>
-      <yloc>464</yloc>
+      <xloc>880</xloc>
+      <yloc>512</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -183,7 +196,7 @@
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_delta.hpl</filename>
+      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/recruitment_five_flow_delta.hpl</filename>
       <logext/>
       <logfile/>
       <loglevel>Basic</loglevel>
@@ -196,62 +209,50 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>784</xloc>
+      <xloc>880</xloc>
       <yloc>704</yloc>
       <attributes_hac/>
     </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>vich_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>272</xloc>
-      <yloc>160</yloc>
-      <attributes_hac/>
-    </action>
   </actions>
   <hops>
     <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
+      <from>Start</from>
+      <to>check_if_citizen_spouse_job_exists.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>check_if_citizen_spouse_job_exists.hpl</from>
+      <to>citizen_spouse_job_exists_check</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
+      <from>citizen_spouse_job_exists_check</from>
+      <to>recruitments_five_flow.hpl</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>citizen_spouse_job_exists_check</from>
+      <to>check_if_need_to_repeat_job.hpl</to>
       <enabled>Y</enabled>
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>check_if_need_to_repeat.hpl</from>
+      <from>check_if_need_to_repeat_job.hpl</from>
       <to>Simple evaluation</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
+      <to>recruitment_five_flow_on_error.hpl</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
@@ -263,20 +264,6 @@
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>Start</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/mappings/info_recruits/citizen_tables/citizen_spouse/recruitments_five_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_spouse/recruitments_five_flow.hpl
new file mode 100644
index 0000000..6dccdb6
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/citizen_spouse/recruitments_five_flow.hpl
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitments_five_flow</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/04/18 09:48:01.970</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/04/18 09:48:01.970</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>citizen_spouse_flow.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>citizen_spouse_flow.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>citizen_spouse_flow.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>citizen_spouse_flow.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>citizen_spouse_flow.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Get all recruitments ordered by created_date</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit/>
+    <sql>SELECT 
+idm_id AS recruitment
+FROM ervu_dashboard.recruitment;</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>432</xloc>
+      <yloc>304</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_spouse_flow.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_spouse_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>144</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_spouse_flow.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_spouse_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_spouse_flow.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_spouse_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>304</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_spouse_flow.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_spouse_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>384</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizen_spouse_flow.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizen_spouse/parallel/citizen_spouse_flow.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizen_spouse_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>704</xloc>
+      <yloc>464</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizenship/recruitment_five_flow_delta.hpl
similarity index 86%
rename from mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/citizenship/recruitment_five_flow_delta.hpl
index 0234694..be774d3 100644
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizenship/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:31:52.575</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:31:52.575</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>incapacity_flow_repeat.hpl</to>
+      <to>citizenship_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>incapacity_flow_repeat.hpl 2</to>
+      <to>citizenship_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>incapacity_flow_repeat.hpl 3</to>
+      <to>citizenship_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>incapacity_flow_repeat.hpl 4</to>
+      <to>citizenship_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>incapacity_flow_repeat.hpl 5</to>
+      <to>citizenship_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,137 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'incapacity_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'citizenship_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizenship_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship/parallel/citizenship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>citizenship_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship/parallel/citizenship_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>citizenship_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
     <GUI>
       <xloc>656</xloc>
-      <yloc>464</yloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow_repeat.hpl</name>
+    <name>citizenship_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship/parallel/citizenship_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -101,7 +213,7 @@ WHERE je.id IS NULL
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>citizenship_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -126,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>304</yloc>
+      <xloc>656</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow_repeat.hpl 2</name>
+    <name>citizenship_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -142,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship/parallel/citizenship_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -157,7 +269,7 @@ WHERE je.id IS NULL
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>citizenship_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -182,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>384</yloc>
+      <xloc>656</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow_repeat.hpl 3</name>
+    <name>citizenship_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -198,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/citizenship/parallel/citizenship_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -213,7 +325,7 @@ WHERE je.id IS NULL
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>citizenship_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -238,120 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_repeat.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>recruitment_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>864</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_repeat.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>recruitment_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>864</xloc>
-      <yloc>624</yloc>
+      <xloc>656</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/deferment_liberation/deferment_decision_update_date_ervu_dashboard.hpl b/mappings/info_recruits/citizen_tables/deferment_liberation/deferment_decision_update_date_ervu_dashboard.hpl
new file mode 100644
index 0000000..339243a
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/deferment_liberation/deferment_decision_update_date_ervu_dashboard.hpl
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>deferment_decision_update_date_ervu_dashboard</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/06/02 14:50:31.833</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/06/02 14:50:31.833</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit>0</limit>
+    <sql>SELECT 
+    created_at AS system_create_date,
+    CASE
+	WHEN updated_at is null THEN '0001-01-01 00:00:00'
+	ELSE updated_at
+    END as system_update_date,
+    current_timestamp AS record_created,
+    'deferment_decision_table' AS workflow
+FROM ervu_dashboard.deferment_liberation
+WHERE updated_at = (SELECT MAX(updated_at) FROM ervu_dashboard.deferment_liberation)
+limit 1</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>896</xloc>
+      <yloc>304</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table output</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>1000</commit>
+    <connection>ervu-dashboard</connection>
+    <fields>
+</fields>
+    <ignore_errors>N</ignore_errors>
+    <only_when_have_rows>N</only_when_have_rows>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <return_keys>N</return_keys>
+    <schema>public</schema>
+    <specify_fields>N</specify_fields>
+    <table>recruit_create</table>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_in_table>Y</tablename_in_table>
+    <truncate>N</truncate>
+    <use_batch>Y</use_batch>
+    <attributes/>
+    <GUI>
+      <xloc>1216</xloc>
+      <yloc>304</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/deferment_liberation/recruitment_five_flow_delta.hpl
similarity index 81%
rename from mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/deferment_liberation/recruitment_five_flow_delta.hpl
index 254dc34..dd1d7f6 100644
--- a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/deferment_liberation/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:31:52.575</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:31:52.575</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>vich_flow_repeat.hpl</to>
+      <to>deferment_liberation_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>vich_flow_repeat.hpl 2</to>
+      <to>deferment_liberation_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>vich_flow_repeat.hpl 3</to>
+      <to>deferment_liberation_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>vich_flow_repeat.hpl 4</to>
+      <to>deferment_liberation_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>vich_flow_repeat.hpl 5</to>
+      <to>deferment_liberation_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,193 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'incapacity_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'deferment_liberation_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation/parallel/deferment_liberation_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation/parallel/deferment_liberation_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>deferment_liberation_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation/parallel/deferment_liberation_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
     <GUI>
       <xloc>656</xloc>
-      <yloc>464</yloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>vich_flow_repeat.hpl</name>
+    <name>deferment_liberation_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation/parallel/deferment_liberation_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -98,6 +266,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>304</yloc>
+      <xloc>656</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>vich_flow_repeat.hpl 2</name>
+    <name>deferment_liberation_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/deferment_liberation/parallel/deferment_liberation_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -149,6 +322,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>deferment_liberation_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,161 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_repeat.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>recruitment_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>864</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_repeat.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>recruitment_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>864</xloc>
-      <yloc>544</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_repeat.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>recruitment_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>864</xloc>
-      <yloc>624</yloc>
+      <xloc>656</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/drivers_licence/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/drivers_licence/recruitment_five_flow_delta.hpl
new file mode 100644
index 0000000..d72c66c
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/drivers_licence/recruitment_five_flow_delta.hpl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitment_five_flow_delta</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/11 13:16:11.204</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>drivers_licence_flow_delta.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>drivers_licence_flow_delta.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>drivers_licence_flow_delta.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>drivers_licence_flow_delta.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>drivers_licence_flow_delta.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit>0</limit>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'drivers_licence_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>drivers_licence_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/drivers_licence/parallel/drivers_licence_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>drivers_licence_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>drivers_licence_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/drivers_licence/parallel/drivers_licence_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>drivers_licence_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>drivers_licence_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/drivers_licence/parallel/drivers_licence_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>drivers_licence_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>drivers_licence_flow_delta.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/drivers_licence/parallel/drivers_licence_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>drivers_licence_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>drivers_licence_flow_delta.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/drivers_licence/parallel/drivers_licence_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>drivers_licence_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>464</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow.hpl
deleted file mode 100644
index f0ab5ab..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow.hpl
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:07.006</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:07.006</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>disability_flow.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>disability_flow.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>disability_flow.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>disability_flow.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>disability_flow.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Get all recruitments</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>SELECT 
-idm_id
-FROM ervu_dashboard.recruitment;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>560</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>368</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>528</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>608</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_delta.hpl
deleted file mode 100644
index aeb507e..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 20:38:40.987</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:38:40.987</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>disability_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>disability_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>disability_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>disability_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>disability_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>WITH mud AS (
-    SELECT
-        recruitment_id,
-        MAX(execution_datetime) AS max_upd_date
-    FROM etl.job_execution
-    WHERE job_name = '${JOB_NAME}'
-      AND status IN ('SUCCESS','DELTA_ERROR','DELTA_SUCCESS','DELTA_PROCESSING')
-    GROUP BY recruitment_id
-)
-SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         JOIN mud ON mud.recruitment_id = r.idm_id
-         JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > mud.max_upd_date;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>704</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>336</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from disability;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>528</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>576</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disability_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>656</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl b/mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl
deleted file mode 100644
index 502451b..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>health_state_constants_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 16:43:33.050</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 16:43:33.050</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>disease_input</from>
-      <to>Table output</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-<<<<<<< HEAD:mappings/info_recruits/citizen_tables/deferment_liberation/deferment_decision_update_date_ervu_dashboard.hpl
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT * FROM (
-    SELECT 
-        created_at AS system_create_date,
-        CASE
-            WHEN updated_at IS NULL THEN '0001-01-01 00:00:00'::timestamp
-            ELSE updated_at
-        END AS system_update_date,
-        current_timestamp AS record_created,
-        'deferment_decision_table' AS workflow
-    FROM ervu_dashboard.deferment_liberation
-    WHERE permission_fact = 'fact'
-        AND updated_at = (SELECT MAX(updated_at) FROM ervu_dashboard.deferment_liberation WHERE permission_fact = 'fact')
-    LIMIT 1
-) AS first_query
-
-UNION ALL
-
-SELECT * FROM (
-    SELECT 
-        created_at AS system_create_date,
-        CASE
-            WHEN updated_at IS NULL THEN '0001-01-01 00:00:00'::timestamp
-            ELSE updated_at
-    END AS system_update_date,
-    current_timestamp AS record_created,
-    'recruits_deferment_table' AS workflow
-    FROM ervu_dashboard.deferment_liberation
-    WHERE permission_fact = 'permission'
-        AND updated_at = (SELECT MAX(updated_at) FROM ervu_dashboard.deferment_liberation WHERE permission_fact = 'permission')
-    LIMIT 1
-) AS second_query</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>304</yloc>
-    </GUI>
-  </transform>
-  <transform>
-=======
->>>>>>> 10bcf8dc200fb1b4ce7b6f5b82d5b8cd20b5b935:mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl
-    <name>Table output</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <fields>
-      <field>
-        <column_name>code</column_name>
-        <stream_name>code</stream_name>
-      </field>
-      <field>
-        <column_name>value</column_name>
-        <stream_name>value</stream_name>
-      </field>
-      <field>
-        <column_name>actual</column_name>
-        <stream_name>actual</stream_name>
-      </field>
-      <field>
-        <column_name>update_date</column_name>
-        <stream_name>update_date</stream_name>
-      </field>
-    </fields>
-    <ignore_errors>N</ignore_errors>
-    <only_when_have_rows>N</only_when_have_rows>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <return_keys>N</return_keys>
-    <schema>ervu_dashboard</schema>
-    <specify_fields>Y</specify_fields>
-    <table>disease</table>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_in_table>Y</tablename_in_table>
-    <truncate>N</truncate>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>608</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>disease_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'diseaseCode';</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>400</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/health_state_job.hwf b/mappings/info_recruits/citizen_tables/medicine/health_state/health_state_job.hwf
deleted file mode 100644
index c6360c7..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/health_state_job.hwf
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<workflow>
-  <name>health_state_job</name>
-  <name_sync_with_filename>Y</name_sync_with_filename>
-  <description/>
-  <extended_description/>
-  <workflow_version/>
-  <created_user>-</created_user>
-  <created_date>2025/09/08 20:45:23.262</created_date>
-  <modified_user>-</modified_user>
-  <modified_date>2025/09/08 20:45:23.262</modified_date>
-  <parameters>
-    </parameters>
-  <actions>
-    <action>
-      <name>Start</name>
-      <description/>
-      <type>SPECIAL</type>
-      <attributes/>
-      <DayOfMonth>1</DayOfMonth>
-      <hour>12</hour>
-      <intervalMinutes>60</intervalMinutes>
-      <intervalSeconds>0</intervalSeconds>
-      <minutes>0</minutes>
-      <repeat>N</repeat>
-      <schedulerType>0</schedulerType>
-      <weekDay>1</weekDay>
-      <parallel>N</parallel>
-      <xloc>256</xloc>
-      <yloc>256</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_job_execution_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_job_execution_exists.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1136</xloc>
-      <yloc>272</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>employer_job_execution_exists_check</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>false</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>JOB_EXECUTED_FLAG</variablename>
-      <parallel>N</parallel>
-      <xloc>1440</xloc>
-      <yloc>272</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>Y</parallel>
-      <xloc>1744</xloc>
-      <yloc>272</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1744</xloc>
-      <yloc>576</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_need_to_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/support/check_if_need_to_repeat.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1440</xloc>
-      <yloc>416</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>Simple evaluation</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>NEED_TO_REPEAT_JOB</variablename>
-      <parallel>N</parallel>
-      <xloc>1440</xloc>
-      <yloc>576</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>recruitment_five_flow_delta.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_delta.hpl</filename>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>1440</xloc>
-      <yloc>768</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>init_job_name</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <fields>
-        <field>
-          <variable_name>JOB_NAME</variable_name>
-          <variable_type>CURRENT_WORKFLOW</variable_type>
-          <variable_value>health_state_job</variable_value>
-        </field>
-      </fields>
-      <file_variable_type>CURRENT_WORKFLOW</file_variable_type>
-      <replacevars>N</replacevars>
-      <parallel>N</parallel>
-      <xloc>944</xloc>
-      <yloc>272</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>check_if_constants_exists.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/constants/support/check_if_constants_exists.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>384</xloc>
-      <yloc>256</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>constants_exists</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <fieldtype>boolean</fieldtype>
-      <successbooleancondition>true</successbooleancondition>
-      <successcondition>equal</successcondition>
-      <successnumbercondition>equal</successnumbercondition>
-      <successwhenvarset>N</successwhenvarset>
-      <valuetype>variable</valuetype>
-      <variablename>CONSTANTS_EXISTS</variablename>
-      <parallel>N</parallel>
-      <xloc>560</xloc>
-      <yloc>256</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>health_state_constants_flow.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>752</xloc>
-      <yloc>176</yloc>
-      <attributes_hac/>
-    </action>
-    <action>
-      <name>health_state_constants_flow_repeat.hpl</name>
-      <description/>
-      <type>PIPELINE</type>
-      <attributes/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <clear_files>N</clear_files>
-      <clear_rows>N</clear_rows>
-      <create_parent_folder>N</create_parent_folder>
-      <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow_repeat.hpl</filename>
-      <logext/>
-      <logfile/>
-      <loglevel>Basic</loglevel>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
-      <params_from_previous>N</params_from_previous>
-      <run_configuration>local</run_configuration>
-      <set_append_logfile>N</set_append_logfile>
-      <set_logfile>N</set_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <parallel>N</parallel>
-      <xloc>752</xloc>
-      <yloc>352</yloc>
-      <attributes_hac/>
-    </action>
-  </actions>
-  <hops>
-    <hop>
-      <from>check_if_job_execution_exists.hpl</from>
-      <to>employer_job_execution_exists_check</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>check_if_need_to_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_need_to_repeat.hpl</from>
-      <to>Simple evaluation</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>init_job_name</from>
-      <to>check_if_job_execution_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>check_if_constants_exists.hpl</from>
-      <to>constants_exists</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>health_state_constants_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>constants_exists</from>
-      <to>health_state_constants_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Start</from>
-      <to>check_if_constants_exists.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>health_state_constants_flow.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>health_state_constants_flow_repeat.hpl</from>
-      <to>init_job_name</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_repeat.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>employer_job_execution_exists_check</from>
-      <to>recruitment_five_flow.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Simple evaluation</from>
-      <to>recruitment_five_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-  </hops>
-  <notepads>
-  </notepads>
-  <attributes/>
-</workflow>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl
deleted file mode 100644
index 0c59209..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>health_state_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 22:10:33.736</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 22:10:33.736</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>health_state_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>health_state_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_upsert</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Abort</name>
-    <type>Abort</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <abort_option>ABORT</abort_option>
-    <always_log_rows>Y</always_log_rows>
-    <row_threshold>0</row_threshold>
-    <attributes/>
-    <GUI>
-      <xloc>1584</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on error</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-      <argument>
-        <name>error_description</name>
-      </argument>
-    </arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>Y</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'DELTA_ERROR',
-    error_description = ?
-WHERE job_name = '${JOB_NAME}' 
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1360</xloc>
-      <yloc>704</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on success</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'DELTA_SUCCESS'
-WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1584</xloc>
-      <yloc>336</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Create job execution record</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
-    status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
-    error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
-    <attributes/>
-    <GUI>
-      <xloc>656</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Detect empty stream</name>
-    <type>DetectEmptyStream</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <attributes/>
-    <GUI>
-      <xloc>1072</xloc>
-      <yloc>336</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter rows</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>=</function>
-        <leftvalue>last_row</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-        <value>
-          <isnull>N</isnull>
-          <length>-1</length>
-          <name>constant</name>
-          <precision>-1</precision>
-          <text>Y</text>
-          <type>Boolean</type>
-        </value>
-      </condition>
-    </compare>
-    <send_true_to>Change job status on success</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>1584</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>1072</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' ->> 'dataSved'  as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov' as zdorov_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov') =
-                            'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        and to_date(ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' ->> 'dataSved',
-                                    'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}')
-SELECT fd.recruit_id,
-       zdorov_elem ->> 'id'                               AS source_id,
-       source_update_date,
-       zdorov_elem ->> 'kodZabol'                         AS disease_code,
-       to_date(zdorov_elem ->> 'dataDiagn', 'YYYY-MM-DD') AS diagnosis_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(zdorov_arr) AS zdorov_elem;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>health_state</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>disease_code</name>
-        <rename>disease_code</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>diagnosis_date</name>
-        <rename>diagnosis_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-<<<<<<< HEAD:mappings/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl
-      <xloc>944</xloc>
-      <yloc>224</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>postgres.subpoena</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>select ssi.* 
-from public.subpoena_send_info ssi
-join public.subpoena s on s.id = ssi.subpoena_id
-WHERE 
-    '${IDM_ID}' != ''  -- Проверка на пустую строку
-    AND s.department_id = '${IDM_ID}'
-    AND s.status_change_date >= '${M_S_UP_DATE}'::timestamp
-${LIMIT_FW}</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>544</xloc>
-      <yloc>224</yloc>
-=======
-      <xloc>1360</xloc>
-      <yloc>512</yloc>
->>>>>>> 10bcf8dc200fb1b4ce7b6f5b82d5b8cd20b5b935:mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl
-    </GUI>
-  </transform>
-  <transform_error_handling>
-    <error>
-      <source_transform>health_state_upsert</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow.hpl
deleted file mode 100644
index ff54894..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow.hpl
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 20:59:52.647</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:59:52.647</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>health_state_flow.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>health_state_flow.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>health_state_flow.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>health_state_flow.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>health_state_flow.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Get all recruitments</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>SELECT 
-idm_id
-FROM ervu_dashboard.recruitment;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>480</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>272</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>352</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>592</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_delta.hpl
deleted file mode 100644
index 806d981..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 21:58:26.774</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 21:58:26.774</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>health_state_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>health_state_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>health_state_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>health_state_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>health_state_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         LEFT JOIN etl.job_execution je
-                   ON r.idm_id = je.recruitment_id
-                       and job_name = 'health_state_job'
- JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > (
-                      SELECT MAX(execution_datetime)
-                      FROM etl.job_execution
-                      WHERE job_name = 'health_state_job'
-                        AND recruitment_id = r.idm_id
-                  )
-where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>816</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from health_state;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>640</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>1008</xloc>
-      <yloc>272</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>1008</xloc>
-      <yloc>352</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>1008</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>1008</xloc>
-      <yloc>512</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>1008</xloc>
-      <yloc>592</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl
deleted file mode 100644
index 6972dd6..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>incapacity_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 20:36:38.686</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:36:38.686</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Create job execution record</from>
-      <to>incapacity_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Filter rows</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>incapacity_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_upsert</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Abort</name>
-    <type>Abort</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <abort_option>ABORT</abort_option>
-    <always_log_rows>Y</always_log_rows>
-    <row_threshold>0</row_threshold>
-    <attributes/>
-    <GUI>
-      <xloc>1744</xloc>
-      <yloc>560</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on error</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-      <argument>
-        <name>error_description</name>
-      </argument>
-    </arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>Y</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'DELTA_ERROR',
-    error_description = ?
-WHERE job_name = '${JOB_NAME}' 
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1520</xloc>
-      <yloc>560</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Change job status on success</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>Y</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution
-SET status = 'DELTA_SUCCESS'
-WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
-
-</sql>
-    <attributes/>
-    <GUI>
-      <xloc>1744</xloc>
-      <yloc>208</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Create job execution record</name>
-    <type>ExecSql</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <arguments>
-</arguments>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <quoteString>N</quoteString>
-    <replace_variables>Y</replace_variables>
-    <set_params>N</set_params>
-    <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
-    status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
-    error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
-    <attributes/>
-    <GUI>
-      <xloc>816</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Detect empty stream</name>
-    <type>DetectEmptyStream</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <attributes/>
-    <GUI>
-      <xloc>1232</xloc>
-      <yloc>208</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Filter rows</name>
-    <type>FilterRows</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <compare>
-      <condition>
-        <conditions>
-</conditions>
-        <function>=</function>
-        <leftvalue>last_row</leftvalue>
-        <negated>N</negated>
-        <operator>-</operator>
-        <value>
-          <isnull>N</isnull>
-          <length>-1</length>
-          <name>constant</name>
-          <precision>-1</precision>
-          <text>Y</text>
-          <type>Boolean</type>
-        </value>
-      </condition>
-    </compare>
-    <send_true_to>Change job status on success</send_true_to>
-    <attributes/>
-    <GUI>
-      <xloc>1744</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>1232</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob' as nedeesposob_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') = 'array'
-                        AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       nedeesposob_elem ->> 'id'                                AS source_id,
-       to_date(nedeesposob_elem ->> 'dataSved', 'YYYY-MM-DD')   AS source_update_date,
-       nedeesposob_elem ->> 'naimStatus'                        AS capacity_status,
-       nedeesposob_elem ->> 'naimOrg'                           AS court_name,
-       to_date(nedeesposob_elem ->> 'dataPrisv', 'YYYY-MM-DD')  AS register_date,
-       to_date(nedeesposob_elem ->> 'dataOkonch', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(fd.nedeesposob_arr -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') AS nedeesposob_elem
-WHERE to_date(nedeesposob_elem ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}';</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>1040</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-<<<<<<< HEAD:mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl
-        <field>id</field>
-        <name>id</name>
-      </key>
-      <key>
-        <condition>=</condition>
-        <field>created_at</field>
-        <name>created_at</name>
-=======
-        <field>source_id</field>
-        <name>source_id</name>
->>>>>>> 10bcf8dc200fb1b4ce7b6f5b82d5b8cd20b5b935:mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>disability</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>capacity_status</name>
-        <rename>capacity_status</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>court_name</name>
-        <rename>court_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-<<<<<<< HEAD:mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl
-      <xloc>944</xloc>
-      <yloc>224</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>N</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>postgres.subpoena</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>SELECT
-*
-FROM public.restriction_document 
-WHERE 
-    '${IDM_ID}' != ''  -- Проверка на пустую строку
-    AND vk_id = '${IDM_ID}'
-    AND updated_at >= '${M_RESTRDOC_UP_DATE}'::timestamp
-
-${LIMIT_FW}</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>544</xloc>
-      <yloc>224</yloc>
-=======
-      <xloc>1520</xloc>
-      <yloc>384</yloc>
->>>>>>> 10bcf8dc200fb1b4ce7b6f5b82d5b8cd20b5b935:mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl
-    </GUI>
-  </transform>
-  <transform_error_handling>
-    <error>
-      <source_transform>incapacity_upsert</source_transform>
-      <target_transform>Change job status on error</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_delta.hpl
deleted file mode 100644
index bdae4c3..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 20:38:40.987</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:38:40.987</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>incapacity_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>incapacity_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>incapacity_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>incapacity_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>incapacity_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>WITH mud AS (
-    SELECT
-        recruitment_id,
-        MAX(execution_datetime) AS max_upd_date
-    FROM etl.job_execution
-    WHERE job_name = '${JOB_NAME}'
-      AND status IN ('SUCCESS','DELTA_ERROR','DELTA_SUCCESS','DELTA_PROCESSING')
-    GROUP BY recruitment_id
-)
-SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         JOIN mud ON mud.recruitment_id = r.idm_id
-         JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > mud.max_upd_date;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>704</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from incapacity;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>528</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>336</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>576</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>incapacity_job</input>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>656</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow.hpl
deleted file mode 100644
index 95f4a25..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow.hpl
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:07.006</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:07.006</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>vich_flow.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>vich_flow.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>vich_flow.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>vich_flow.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Get all recruitments</from>
-      <to>vich_flow.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Get all recruitments</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <sql>SELECT 
-idm_id
-FROM ervu_dashboard.recruitment;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>560</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>288</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>368</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>528</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>832</xloc>
-      <yloc>608</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_delta.hpl
deleted file mode 100644
index 014da7d..0000000
--- a/mappings/info_recruits/citizen_tables/medicine/vich/recruitment_five_flow_delta.hpl
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pipeline>
-  <info>
-    <name>recruitment_five_flow_delta</name>
-    <name_sync_with_filename>Y</name_sync_with_filename>
-    <description/>
-    <extended_description/>
-    <pipeline_version/>
-    <pipeline_type>Normal</pipeline_type>
-    <parameters>
-    </parameters>
-    <capture_transform_performance>N</capture_transform_performance>
-    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
-    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
-    <created_user>-</created_user>
-    <created_date>2025/09/08 20:38:40.987</created_date>
-    <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:38:40.987</modified_date>
-  </info>
-  <notepads>
-  </notepads>
-  <order>
-    <hop>
-      <from>Table input</from>
-      <to>vich_flow_delta.hpl</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>get_max_source_update_date</from>
-      <to>Table input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>vich_flow_delta.hpl 2</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>vich_flow_delta.hpl 3</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>vich_flow_delta.hpl 4</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Table input</from>
-      <to>vich_flow_delta.hpl 5</to>
-      <enabled>Y</enabled>
-    </hop>
-  </order>
-  <transform>
-    <name>Table input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard-test</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_source_update_date</lookup>
-    <sql>WITH mud AS (
-    SELECT
-        recruitment_id,
-        MAX(execution_datetime) AS max_upd_date
-    FROM etl.job_execution
-    WHERE job_name = '${JOB_NAME}'
-      AND status IN ('SUCCESS','DELTA_ERROR','DELTA_SUCCESS','DELTA_PROCESSING')
-    GROUP BY recruitment_id
-)
-SELECT
-    r.idm_id,
-    ? max_source_update_date
-FROM ervu_dashboard.recruitment r
-         JOIN mud ON mud.recruitment_id = r.idm_id
-         JOIN recruits_info ri
-              ON COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = r.idm_id
-                  AND ri.updated_at > mud.max_upd_date;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>704</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_source_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>select max(source_update_date)
-from vich_registered;</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>528</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_delta.hpl</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>336</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_delta.hpl 2</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>416</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_delta.hpl 3</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>496</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_delta.hpl 4</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>576</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_flow_delta.hpl 5</name>
-    <type>PipelineExecutor</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl</filename>
-    <filenameInField>N</filenameInField>
-    <filenameField/>
-    <group_size>1</group_size>
-    <group_field/>
-    <group_time/>
-    <parameters>
-      <variable_mapping>
-        <variable>IDM_ID</variable>
-        <field>idm_id</field>
-        <input/>
-      </variable_mapping>
-      <variable_mapping>
-        <variable>MAX_SOURCE_UPDATE_DATE</variable>
-        <field>max_source_update_date</field>
-        <input/>
-      </variable_mapping>
-      <inherit_all_vars>Y</inherit_all_vars>
-    </parameters>
-    <execution_result_target_transform/>
-    <execution_time_field>ExecutionTime</execution_time_field>
-    <execution_result_field>ExecutionResult</execution_result_field>
-    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
-    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
-    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
-    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
-    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
-    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
-    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
-    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
-    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
-    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
-    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
-    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
-    <result_rows_target_transform/>
-    <result_files_target_transform/>
-    <result_files_file_name_field>FileName</result_files_file_name_field>
-    <executors_output_transform/>
-    <attributes/>
-    <GUI>
-      <xloc>896</xloc>
-      <yloc>656</yloc>
-    </GUI>
-  </transform>
-  <transform_error_handling>
-  </transform_error_handling>
-  <attributes/>
-</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl b/mappings/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl
similarity index 74%
rename from mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl
rename to mappings/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl
index 02cd627..cb2fe0c 100644
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>incapacity_flow</name>
+    <name>passport_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,46 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:20.455</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:20.455</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>incapacity_input</to>
+      <from>Table output</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +61,8 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>incapacity_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>576</yloc>
+      <xloc>1264</xloc>
+      <yloc>608</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>992</xloc>
-      <yloc>576</yloc>
+      <xloc>896</xloc>
+      <yloc>608</yloc>
     </GUI>
   </transform>
   <transform>
@@ -143,13 +143,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution
 SET status = 'SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}
+and status = 'PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>240</yloc>
+      <xloc>1264</xloc>
+      <yloc>176</yloc>
     </GUI>
   </transform>
   <transform>
@@ -178,7 +179,7 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <attributes/>
     <GUI>
       <xloc>288</xloc>
-      <yloc>416</yloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -194,8 +195,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>240</yloc>
+      <xloc>896</xloc>
+      <yloc>176</yloc>
     </GUI>
   </transform>
   <transform>
@@ -230,15 +231,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>416</yloc>
+      <xloc>1264</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -248,12 +249,12 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>416</yloc>
+      <xloc>640</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -266,41 +267,51 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (
-    SELECT ri.recruit_id,
-           ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob' as nedeesposob_arr
-    FROM recruits_info ri
-    WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') = 'array'
-      AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       nedeesposob_elem ->> 'id'                                AS source_id,
-       to_date(nedeesposob_elem ->> 'dataSved', 'YYYY-MM-DD')   AS source_update_date,
-       nedeesposob_elem ->> 'naimStatus'                        AS capacity_status,
-       nedeesposob_elem ->> 'naimOrg'                           AS court_name,
-       to_date(nedeesposob_elem ->> 'dataPrisv', 'YYYY-MM-DD')  AS register_date,
-       to_date(nedeesposob_elem ->> 'dataOkonch', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(fd.nedeesposob_arr -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') AS nedeesposob_elem;</sql>
+    <sql>SELECT
+    ri.recruit_id,
+    NULLIF(p.passport_data->>'nomDok', '') AS passport_number,
+    NULLIF(p.passport_data->>'serDok', '') AS passport_series,
+    NULLIF(p.passport_data->>'vydDok', '') AS organization_name,
+    NULLIF(p.passport_data->>'kodVydDok', '') AS unit_code,
+    TO_DATE(NULLIF(p.passport_data->>'dataDok', ''), 'YYYY-MM-DD') AS issue_date,
+    CASE
+        WHEN NULLIF(p.passport_data->>'kodStatus', '') = '1' THEN TRUE
+        ELSE FALSE
+    END AS actual
+FROM recruits_info ri
+JOIN ervu_dashboard.citizen r
+    ON r.recruit_id = ri.recruit_id
+    AND '${IDM_ID}' != ''
+    AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+    AND '${M_R_CR_DATE}'::timestamp >= r.recruit_create_date
+JOIN LATERAL (
+    SELECT passport_data
+    FROM UNNEST(ARRAY[
+        ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF',
+        ri.info->'svedFL'->'svedBS'->'pasportRF'->'predPasportRF'
+    ]) AS passport_data
+    WHERE passport_data IS NOT NULL AND passport_data::text &lt;&gt; 'null'
+) AS p ON TRUE
+</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>512</xloc>
-      <yloc>416</yloc>
+      <xloc>496</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_output</name>
+    <name>Table output</name>
     <type>TableOutput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <fields>
       <field>
@@ -308,28 +319,28 @@ FROM filteredData fd
         <stream_name>recruit_id</stream_name>
       </field>
       <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
+        <column_name>passport_number</column_name>
+        <stream_name>passport_number</stream_name>
       </field>
       <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
+        <column_name>passport_series</column_name>
+        <stream_name>passport_series</stream_name>
       </field>
       <field>
-        <column_name>capacity_status</column_name>
-        <stream_name>capacity_status</stream_name>
+        <column_name>organization_name</column_name>
+        <stream_name>organization_name</stream_name>
       </field>
       <field>
-        <column_name>court_name</column_name>
-        <stream_name>court_name</stream_name>
+        <column_name>unit_code</column_name>
+        <stream_name>unit_code</stream_name>
       </field>
       <field>
-        <column_name>register_date</column_name>
-        <stream_name>register_date</stream_name>
+        <column_name>issue_date</column_name>
+        <stream_name>issue_date</stream_name>
       </field>
       <field>
-        <column_name>deregistration_date</column_name>
-        <stream_name>deregistration_date</stream_name>
+        <column_name>actual</column_name>
+        <stream_name>actual</stream_name>
       </field>
     </fields>
     <ignore_errors>N</ignore_errors>
@@ -340,26 +351,26 @@ FROM filteredData fd
     <return_keys>N</return_keys>
     <schema>ervu_dashboard</schema>
     <specify_fields>Y</specify_fields>
-    <table>incapacity</table>
+    <table>passport</table>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
     <truncate>N</truncate>
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>992</xloc>
-      <yloc>416</yloc>
+      <xloc>896</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>incapacity_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl
similarity index 72%
rename from mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl
index 7c11f4f..b7c0e1c 100644
--- a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/passport/parallel/passport_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>vich_flow_repeat</name>
+    <name>passport_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,46 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:32:10.265</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:32:10.265</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>incapacity_input</to>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +61,8 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>incapacity_upsert</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_upsert</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>incapacity_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>608</yloc>
+      <xloc>1008</xloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform>
@@ -109,7 +109,7 @@
     <set_params>Y</set_params>
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution
-SET status = 'ERROR',
+SET status = 'DELTA_ERROR',
     error_description = ?
 WHERE job_name = '${JOB_NAME}' 
 and recruitment_id = '${IDM_ID}';
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1120</xloc>
-      <yloc>608</yloc>
+      <xloc>752</xloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform>
@@ -141,15 +141,16 @@ and recruitment_id = '${IDM_ID}';
     <set_params>N</set_params>
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution
-SET status = 'SUCCESS'
+SET status = 'DELTA_SUCCESS'
 WHERE job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';
+and recruitment_id = '${IDM_ID}'
+and status = 'DELTA_PROCESSING';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>256</yloc>
+      <xloc>1120</xloc>
+      <yloc>80</yloc>
     </GUI>
   </transform>
   <transform>
@@ -173,15 +174,15 @@ and recruitment_id = '${IDM_ID}';
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution  
 SET
-    status = 'PROCESSING',
-    execution_datetime = current_timestamp,
+    status = 'DELTA_PROCESSING',
+    execution_datetime = DEFAULT,
     error_description = NULL
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>416</xloc>
-      <yloc>432</yloc>
+      <xloc>128</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +198,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>256</yloc>
+      <xloc>752</xloc>
+      <yloc>80</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +234,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>432</yloc>
+      <xloc>1120</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,12 +252,81 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>432</yloc>
+      <xloc>560</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_input</name>
+    <name>Insert / update</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>100</commit>
+    <connection>ervu-dashboard</connection>
+    <lookup>
+      <key>
+        <condition>=</condition>
+        <field>recruit_id</field>
+        <name>recruit_id</name>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>actual</field>
+        <name>actual</name>
+      </key>
+      <schema>ervu_dashboard</schema>
+      <table>passport</table>
+      <value>
+        <name>recruit_id</name>
+        <rename>recruit_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>passport_number</name>
+        <rename>passport_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>passport_series</name>
+        <rename>passport_series</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>organization_name</name>
+        <rename>organization_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>unit_code</name>
+        <rename>unit_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>issue_date</name>
+        <rename>issue_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>actual</name>
+        <rename>actual</rename>
+        <update>N</update>
+      </value>
+    </lookup>
+    <update_bypassed>N</update_bypassed>
+    <attributes/>
+    <GUI>
+      <xloc>752</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -269,100 +339,49 @@ and recruitment_id = '${IDM_ID}';</sql>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             to_date(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' ->> 'dataSved',
-                                     'YYYY-MM-DD')                                               as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet' as vich_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       vich_elem ->> 'id'                                   AS source_id,
-       fd.source_update_date,
-       to_date(vich_elem ->> 'dataSnyat', 'YYYY-MM-DD')     AS register_date,
-       to_date(vich_elem ->> 'dataPostUchet', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(vich_arr) AS vich_elem;</sql>
+    <sql>SELECT
+    ri.recruit_id,
+    NULLIF(p.passport_data->>'nomDok', '') AS passport_number,
+    NULLIF(p.passport_data->>'serDok', '') AS passport_series,
+    NULLIF(p.passport_data->>'vydDok', '') AS organization_name,
+    NULLIF(p.passport_data->>'kodVydDok', '') AS unit_code,
+    TO_DATE(NULLIF(p.passport_data->>'dataDok', ''), 'YYYY-MM-DD') AS issue_date,
+    CASE
+        WHEN NULLIF(p.passport_data->>'kodStatus', '') = '1' THEN TRUE
+        ELSE FALSE
+    END AS actual
+FROM recruits_info ri
+JOIN ervu_dashboard.citizen r
+    ON r.recruit_id = ri.recruit_id
+    AND '${IDM_ID}' != ''
+    AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+    AND '${M_R_CR_DATE}'::timestamp >= r.recruit_create_date
+    AND r.update_date >= '${M_R_UP_DATE}'::timestamp
+JOIN LATERAL (
+    SELECT passport_data
+    FROM UNNEST(ARRAY[
+        ri.info->'svedFL'->'svedBS'->'pasportRF'->'aktPasportRF',
+        ri.info->'svedFL'->'svedBS'->'pasportRF'->'predPasportRF'
+    ]) AS passport_data
+    WHERE passport_data IS NOT NULL AND passport_data::text &lt;&gt; 'null'
+) AS p ON TRUE
+</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_upsert</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>disability</table>
-      <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
-        <update>N</update>
-      </value>
-      <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>capacity_status</name>
-        <rename>capacity_status</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>court_name</name>
-        <rename>court_name</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
-        <update>Y</update>
-      </value>
-      <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
-        <update>Y</update>
-      </value>
-    </lookup>
-    <update_bypassed>N</update_bypassed>
-    <attributes/>
-    <GUI>
-      <xloc>1120</xloc>
-      <yloc>432</yloc>
+      <xloc>400</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>incapacity_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_on_error.hpl
similarity index 83%
rename from mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_on_error.hpl
index 65d9cfc..56c602d 100644
--- a/mappings/info_recruits/citizen_tables/medicine/disability/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/passport/recruitment_five_flow_on_error.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_on_error</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:31:52.575</created_date>
+    <created_date>2025/08/05 12:54:50.126</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:31:52.575</modified_date>
+    <modified_date>2025/08/05 12:54:50.126</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>disability_flow_repeat.hpl</to>
+      <to>passport_flow_repeat.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>disability_flow_repeat.hpl 2</to>
+      <to>passport_flow_repeat.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>disability_flow_repeat.hpl 3</to>
+      <to>passport_flow_repeat.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>disability_flow_repeat.hpl 4</to>
+      <to>passport_flow_repeat.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>disability_flow_repeat.hpl 5</to>
+      <to>passport_flow_repeat.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <limit/>
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'disability_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'passport_job'
+where je.status is null or je.status in('ERROR', 'PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>656</xloc>
-      <yloc>464</yloc>
+      <xloc>272</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_flow_repeat.hpl</name>
+    <name>passport_flow_repeat.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +86,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_repeat.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -98,6 +98,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +126,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>304</yloc>
+      <xloc>464</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_flow_repeat.hpl 2</name>
+    <name>passport_flow_repeat.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +142,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_repeat.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -149,6 +154,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,12 +182,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>384</yloc>
+      <xloc>464</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_flow_repeat.hpl 3</name>
+    <name>passport_flow_repeat.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -188,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_repeat.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -200,6 +210,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -223,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>464</yloc>
+      <xloc>464</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_flow_repeat.hpl 4</name>
+    <name>passport_flow_repeat.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -239,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_repeat.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -251,6 +266,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -274,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>544</yloc>
+      <xloc>464</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>disability_flow_repeat.hpl 5</name>
+    <name>passport_flow_repeat.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -290,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/disability/parallel/disability_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow_repeat.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -302,6 +322,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>passport_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -325,8 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>864</xloc>
-      <yloc>624</yloc>
+      <xloc>464</xloc>
+      <yloc>528</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow.hpl b/mappings/info_recruits/citizen_tables/passport/recruitments_five_flow.hpl
similarity index 84%
rename from mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow.hpl
rename to mappings/info_recruits/citizen_tables/passport/recruitments_five_flow.hpl
index 3d15cae..18397ed 100644
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/recruitment_five_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/passport/recruitments_five_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow</name>
+    <name>recruitments_five_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,41 +13,41 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:07.006</created_date>
+    <created_date>2025/04/18 09:48:01.970</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:07.006</modified_date>
+    <modified_date>2025/04/18 09:48:01.970</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Get all recruitments</from>
-      <to>incapacity_flow.hpl</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>passport_flow.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>incapacity_flow.hpl 2</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>passport_flow.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>incapacity_flow.hpl 3</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>passport_flow.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>incapacity_flow.hpl 4</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>passport_flow.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Get all recruitments</from>
-      <to>incapacity_flow.hpl 5</to>
+      <from>Get all recruitments ordered by created_date</from>
+      <to>passport_flow.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>Get all recruitments</name>
+    <name>Get all recruitments ordered by created_date</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -57,20 +57,21 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT 
-idm_id
+idm_id AS recruitment
 FROM ervu_dashboard.recruitment;</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>560</xloc>
-      <yloc>448</yloc>
+      <xloc>432</xloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow.hpl</name>
+    <name>passport_flow.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -81,7 +82,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -90,13 +91,13 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>passport_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -121,12 +122,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>288</yloc>
+      <xloc>704</xloc>
+      <yloc>144</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow.hpl 2</name>
+    <name>passport_flow.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +138,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -146,13 +147,13 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>passport_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -177,12 +178,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>368</yloc>
+      <xloc>704</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow.hpl 3</name>
+    <name>passport_flow.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -193,7 +194,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -202,13 +203,13 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>passport_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -233,12 +234,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>448</yloc>
+      <xloc>704</xloc>
+      <yloc>304</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow.hpl 4</name>
+    <name>passport_flow.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -249,7 +250,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -258,13 +259,13 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>passport_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -289,12 +290,12 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>528</yloc>
+      <xloc>704</xloc>
+      <yloc>384</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_flow.hpl 5</name>
+    <name>passport_flow.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -305,7 +306,7 @@ FROM ervu_dashboard.recruitment;</sql>
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/passport/parallel/passport_flow.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -314,13 +315,13 @@ FROM ervu_dashboard.recruitment;</sql>
     <parameters>
       <variable_mapping>
         <variable>IDM_ID</variable>
-        <field>idm_id</field>
+        <field>recruitment</field>
         <input/>
       </variable_mapping>
       <variable_mapping>
         <variable>JOB_NAME</variable>
         <field/>
-        <input>incapacity_job</input>
+        <input>passport_job</input>
       </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
@@ -345,8 +346,8 @@ FROM ervu_dashboard.recruitment;</sql>
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>608</yloc>
+      <xloc>704</xloc>
+      <yloc>464</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/property/recruitment_five_flow_delta.hpl
similarity index 83%
rename from mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_repeat.hpl
rename to mappings/info_recruits/citizen_tables/property/recruitment_five_flow_delta.hpl
index 3971440..0ac96e5 100644
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/property/recruitment_five_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>recruitment_five_flow_repeat</name>
+    <name>recruitment_five_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,36 +13,36 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 21:44:04.866</created_date>
+    <created_date>2025/08/11 13:16:11.204</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 21:44:04.866</modified_date>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
       <from>Table input</from>
-      <to>health_state_flow_repeat.hpl</to>
+      <to>property_flow_delta.hpl</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>health_state_flow_repeat.hpl 2</to>
+      <to>property_flow_delta.hpl 2</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>health_state_flow_repeat.hpl 3</to>
+      <to>property_flow_delta.hpl 3</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>health_state_flow_repeat.hpl 4</to>
+      <to>property_flow_delta.hpl 4</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Table input</from>
-      <to>health_state_flow_repeat.hpl 5</to>
+      <to>property_flow_delta.hpl 5</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -57,25 +57,25 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard-test</connection>
+    <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT r.idm_id AS recruitment_id
+    <sql>SELECT
+    r.idm_id as recruitment_id
 FROM ervu_dashboard.recruitment r
          LEFT JOIN etl.job_execution je
                    ON r.idm_id = je.recruitment_id
-                       AND je.job_name = 'health_state_job'
-WHERE je.id IS NULL
-   OR je.status IN ('ERROR', 'PROCESSING');</sql>
+                       and job_name = 'property_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
     <variables_active>N</variables_active>
     <attributes/>
     <GUI>
-      <xloc>400</xloc>
-      <yloc>464</yloc>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_flow_repeat.hpl</name>
+    <name>property_flow_delta.hpl</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -86,7 +86,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/parallel/property_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -98,6 +98,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>property_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -121,12 +126,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>304</yloc>
+      <xloc>640</xloc>
+      <yloc>128</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_flow_repeat.hpl 2</name>
+    <name>property_flow_delta.hpl 2</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -137,7 +142,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/parallel/property_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -149,6 +154,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>property_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -172,12 +182,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>384</yloc>
+      <xloc>640</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_flow_repeat.hpl 3</name>
+    <name>property_flow_delta.hpl 3</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -188,7 +198,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/parallel/property_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -200,6 +210,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>property_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -223,12 +238,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>464</yloc>
+      <xloc>640</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_flow_repeat.hpl 4</name>
+    <name>property_flow_delta.hpl 4</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -239,7 +254,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/parallel/property_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -251,6 +266,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>property_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -274,12 +294,12 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>544</yloc>
+      <xloc>640</xloc>
+      <yloc>368</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_flow_repeat.hpl 5</name>
+    <name>property_flow_delta.hpl 5</name>
     <type>PipelineExecutor</type>
     <description/>
     <distribute>Y</distribute>
@@ -290,7 +310,7 @@ WHERE je.id IS NULL
       <schema_name/>
     </partitioning>
     <run_configuration>local</run_configuration>
-    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl</filename>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/property/parallel/property_flow_delta.hpl</filename>
     <filenameInField>N</filenameInField>
     <filenameField/>
     <group_size>1</group_size>
@@ -302,6 +322,11 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>property_job</input>
+      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -325,8 +350,8 @@ WHERE je.id IS NULL
     <executors_output_transform/>
     <attributes/>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>624</yloc>
+      <xloc>640</xloc>
+      <yloc>448</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_delta.hpl b/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_delta.hpl
new file mode 100644
index 0000000..45065a2
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_delta.hpl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitment_five_flow_delta</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/11 13:16:11.204</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_delta.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_delta.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_delta.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_delta.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_delta.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit/>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'punishment_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_delta.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_delta.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>448</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_on_error.hpl b/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_on_error.hpl
new file mode 100644
index 0000000..da6ae9d
--- /dev/null
+++ b/mappings/info_recruits/citizen_tables/punishment/recruitment_five_flow_on_error.hpl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitment_five_flow_on_error</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/05 12:54:50.126</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/05 12:54:50.126</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_repeat.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_repeat.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_repeat.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_repeat.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>punishment_flow_repeat.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit/>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'punishment_job'
+where je.status is null or je.status in('ERROR', 'PROCESSING');</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>272</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_repeat.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_repeat.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_repeat.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_repeat.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>448</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>punishment_flow_repeat.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>punishment_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>528</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/work/employer/recruitment_five_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/work/employer/recruitment_five_flow_repeat.hpl
index fd60da1..ed96db3 100644
--- a/mappings/info_recruits/citizen_tables/work/employer/recruitment_five_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/work/employer/recruitment_five_flow_repeat.hpl
@@ -98,11 +98,6 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>employer_job</input>
-      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -154,11 +149,6 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>employer_job</input>
-      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -210,11 +200,6 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>employer_job</input>
-      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -266,11 +251,6 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>employer_job</input>
-      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
@@ -322,11 +302,6 @@ WHERE je.id IS NULL
         <field>recruitment_id</field>
         <input/>
       </variable_mapping>
-      <variable_mapping>
-        <variable>JOB_NAME</variable>
-        <field/>
-        <input>employer_job</input>
-      </variable_mapping>
       <inherit_all_vars>Y</inherit_all_vars>
     </parameters>
     <execution_result_target_transform/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/support/check_if_constants_exists.hpl b/mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_need_to_repeat_job.hpl
similarity index 70%
rename from mappings/info_recruits/citizen_tables/medicine/health_state/constants/support/check_if_constants_exists.hpl
rename to mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_need_to_repeat_job.hpl
index e1e87ed..5ca8d4b 100644
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/support/check_if_constants_exists.hpl
+++ b/mappings/info_recruits/citizen_tables/work/work_activity/support/check_if_need_to_repeat_job.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>check_if_constants_exists</name>
+    <name>check_if_need_to_repeat_job</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,9 +13,9 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/22 17:28:33.897</created_date>
+    <created_date>2025/08/08 12:27:51.630</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/22 17:28:33.897</modified_date>
+    <modified_date>2025/08/08 12:27:51.630</modified_date>
   </info>
   <notepads>
   </notepads>
@@ -39,17 +39,16 @@
     </partitioning>
     <fields>
       <field>
-        <default_value/>
-        <field_name>constants_exists</field_name>
-        <variable_name>CONSTANTS_EXISTS</variable_name>
-        <variable_type>PARENT_WORKFLOW</variable_type>
+        <field_name>need_to_repeat_job</field_name>
+        <variable_name>NEED_TO_REPEAT_JOB</variable_name>
+        <variable_type>ROOT_WORKFLOW</variable_type>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
     <attributes/>
     <GUI>
       <xloc>624</xloc>
-      <yloc>304</yloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform>
@@ -66,14 +65,18 @@
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
     <limit>0</limit>
-    <sql>SELECT EXISTS (
-    SELECT 1 FROM disease
-) AS constants_exists</sql>
-    <variables_active>Y</variables_active>
+    <sql>SELECT EXISTS (SELECT 1
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'work_activity_job'
+where je.status is null or je.status in ('ERROR', 'PROCESSING')
+) as need_to_repeat_job;</sql>
+    <variables_active>N</variables_active>
     <attributes/>
     <GUI>
       <xloc>336</xloc>
-      <yloc>304</yloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow.hpl
similarity index 65%
rename from mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl
rename to mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow.hpl
index bc512a9..4486fd5 100644
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow.hpl
+++ b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>health_state_flow</name>
+    <name>restriction_document_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,16 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 21:46:18.176</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 21:46:18.176</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Create job execution record</from>
-      <to>health_state_input</to>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -35,46 +30,41 @@
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>health_state_output</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Detect empty stream</from>
       <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>health_state_output</from>
-      <to>has_health_state_update</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>has_health_state_update</from>
+      <from>Change job status on error</from>
       <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>has_health_state_update</from>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -87,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1264</xloc>
-      <yloc>672</yloc>
+      <xloc>1376</xloc>
+      <yloc>512</yloc>
     </GUI>
   </transform>
   <transform>
@@ -127,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1040</xloc>
-      <yloc>672</yloc>
+      <xloc>1024</xloc>
+      <yloc>512</yloc>
     </GUI>
   </transform>
   <transform>
@@ -158,8 +148,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>288</yloc>
+      <xloc>1632</xloc>
+      <yloc>160</yloc>
     </GUI>
   </transform>
   <transform>
@@ -187,8 +177,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
 </sql>
     <attributes/>
     <GUI>
-      <xloc>336</xloc>
-      <yloc>464</yloc>
+      <xloc>288</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -204,8 +194,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>752</xloc>
-      <yloc>288</yloc>
+      <xloc>1632</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -240,15 +230,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1504</xloc>
-      <yloc>464</yloc>
+      <xloc>1024</xloc>
+      <yloc>160</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -259,111 +249,107 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <attributes/>
     <GUI>
       <xloc>752</xloc>
-      <yloc>464</yloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>has_health_state_update</name>
-    <type>Update</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <commit>10000</commit>
-    <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
-    <lookup>
-      <key>
-        <condition>=</condition>
-        <field>recruit_id</field>
-        <name>recruit_id</name>
-      </key>
-      <schema>ervu_dashboard</schema>
-      <table>citizen</table>
-      <value>
-        <name>has_health_state_info</name>
-        <rename>has_health_state_info</rename>
-      </value>
-    </lookup>
-    <skip_lookup>N</skip_lookup>
-    <use_batch>Y</use_batch>
-    <attributes/>
-    <GUI>
-      <xloc>1264</xloc>
-      <yloc>464</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard</connection>
+    <connection>postgres.subpoena</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' ->> 'dataSved'  as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov' as zdorov_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       zdorov_elem ->> 'id'                               AS source_id,
-       source_update_date,
-       zdorov_elem ->> 'kodZabol'                         AS disease_code,
-       to_date(zdorov_elem ->> 'dataDiagn', 'YYYY-MM-DD') AS diagnosis_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(zdorov_arr) AS zdorov_elem;</sql>
+    <sql>SELECT
+*
+FROM public.restriction_document 
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND vk_id = '${IDM_ID}'
+    AND '${M_R_CR_DATE}' >= created_at
+${LIMIT_FW}</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>560</xloc>
-      <yloc>464</yloc>
+      <xloc>496</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_output</name>
+    <name>Table output</name>
     <type>TableOutput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <fields>
       <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
+        <column_name>id</column_name>
+        <stream_name>id</stream_name>
       </field>
       <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
+        <column_name>subpoena_id</column_name>
+        <stream_name>subpoena_id</stream_name>
       </field>
       <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
+        <column_name>created_at</column_name>
+        <stream_name>created_at</stream_name>
       </field>
       <field>
-        <column_name>disease_code</column_name>
-        <stream_name>disease_code</stream_name>
+        <column_name>updated_at</column_name>
+        <stream_name>updated_at</stream_name>
       </field>
       <field>
-        <column_name>diagnosis_date</column_name>
-        <stream_name>diagnosis_date</stream_name>
+        <column_name>vk_id</column_name>
+        <stream_name>vk_id</stream_name>
+      </field>
+      <field>
+        <column_name>user_id</column_name>
+        <stream_name>user_id</stream_name>
+      </field>
+      <field>
+        <column_name>user_name</column_name>
+        <stream_name>user_name</stream_name>
+      </field>
+      <field>
+        <column_name>status</column_name>
+        <stream_name>status</stream_name>
+      </field>
+      <field>
+        <column_name>decision_number</column_name>
+        <stream_name>decision_number</stream_name>
+      </field>
+      <field>
+        <column_name>decision_date</column_name>
+        <stream_name>decision_date</stream_name>
+      </field>
+      <field>
+        <column_name>decision_reason</column_name>
+        <stream_name>decision_reason</stream_name>
+      </field>
+      <field>
+        <column_name>extra_info</column_name>
+        <stream_name>extra_info</stream_name>
+      </field>
+      <field>
+        <column_name>type</column_name>
+        <stream_name>type</stream_name>
+      </field>
+      <field>
+        <column_name>recruitment_name</column_name>
+        <stream_name>recruitment_name</stream_name>
       </field>
     </fields>
     <ignore_errors>N</ignore_errors>
@@ -374,38 +360,26 @@ FROM filteredData fd
     <return_keys>N</return_keys>
     <schema>ervu_dashboard</schema>
     <specify_fields>Y</specify_fields>
-    <table>health_state</table>
+    <table>restriction_document</table>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
     <truncate>N</truncate>
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>1040</xloc>
-      <yloc>464</yloc>
+      <xloc>1024</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>has_health_state_update</source_transform>
-      <target_transform>Abort</target_transform>
-      <is_enabled>Y</is_enabled>
-      <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
-      <fields_valuename/>
-      <codes_valuename/>
-      <max_errors/>
-      <max_pct_errors/>
-      <min_pct_rows/>
-    </error>
-    <error>
-      <source_transform>health_state_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl
new file mode 100644
index 0000000..0c9ab5d
--- /dev/null
+++ b/mappings/info_recruits/raw_data/restriction_document/parallel/restriction_document_flow_delta.hpl
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>restriction_document_flow_delta</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/11 13:22:56.048</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Create job execution record</from>
+      <to>Table input</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Filter rows</from>
+      <to>Change job status on success</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Change job status on error</from>
+      <to>Abort</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Identify last row in a stream</from>
+      <to>Insert / update</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Filter rows</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Abort</name>
+    <type>Abort</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
+    <always_log_rows>Y</always_log_rows>
+    <row_threshold>0</row_threshold>
+    <attributes/>
+    <GUI>
+      <xloc>1168</xloc>
+      <yloc>400</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Change job status on error</name>
+    <type>ExecSql</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <arguments>
+      <argument>
+        <name>error_description</name>
+      </argument>
+    </arguments>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>Y</execute_each_row>
+    <quoteString>N</quoteString>
+    <replace_variables>Y</replace_variables>
+    <set_params>Y</set_params>
+    <single_statement>N</single_statement>
+    <sql>UPDATE etl.job_execution
+SET status = 'DELTA_ERROR',
+    error_description = ?
+WHERE job_name = '${JOB_NAME}' 
+and recruitment_id = '${IDM_ID}';
+
+</sql>
+    <attributes/>
+    <GUI>
+      <xloc>944</xloc>
+      <yloc>400</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Change job status on success</name>
+    <type>ExecSql</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <arguments>
+</arguments>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>Y</execute_each_row>
+    <quoteString>N</quoteString>
+    <replace_variables>Y</replace_variables>
+    <set_params>N</set_params>
+    <single_statement>N</single_statement>
+    <sql>UPDATE etl.job_execution
+SET status = 'DELTA_SUCCESS'
+WHERE job_name = '${JOB_NAME}'
+and recruitment_id = '${IDM_ID}';
+
+</sql>
+    <attributes/>
+    <GUI>
+      <xloc>1248</xloc>
+      <yloc>64</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Create job execution record</name>
+    <type>ExecSql</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <arguments>
+</arguments>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <quoteString>N</quoteString>
+    <replace_variables>Y</replace_variables>
+    <set_params>N</set_params>
+    <single_statement>N</single_statement>
+    <sql>UPDATE etl.job_execution  
+SET
+    status = 'DELTA_PROCESSING',
+    execution_datetime = DEFAULT,
+    error_description = NULL
+where job_name = '${JOB_NAME}'
+and recruitment_id = '${IDM_ID}';</sql>
+    <attributes/>
+    <GUI>
+      <xloc>336</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Detect empty stream</name>
+    <type>DetectEmptyStream</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>1248</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Filter rows</name>
+    <type>FilterRows</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <compare>
+      <condition>
+        <conditions>
+</conditions>
+        <function>=</function>
+        <leftvalue>last_row</leftvalue>
+        <negated>N</negated>
+        <operator>-</operator>
+        <value>
+          <isnull>N</isnull>
+          <length>-1</length>
+          <name>constant</name>
+          <precision>-1</precision>
+          <text>Y</text>
+          <type>Boolean</type>
+        </value>
+      </condition>
+    </compare>
+    <send_true_to>Change job status on success</send_true_to>
+    <attributes/>
+    <GUI>
+      <xloc>944</xloc>
+      <yloc>64</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Identify last row in a stream</name>
+    <type>DetectLastRow</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <resultfieldname>last_row</resultfieldname>
+    <attributes/>
+    <GUI>
+      <xloc>736</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Insert / update</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <commit>100</commit>
+    <connection>ervu-dashboard</connection>
+    <lookup>
+      <key>
+        <condition>=</condition>
+        <field>id</field>
+        <name>id</name>
+        <name2/>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>created_at</field>
+        <name>created_at</name>
+        <name2/>
+      </key>
+      <schema>ervu_dashboard</schema>
+      <table>restriction_document</table>
+      <value>
+        <name>id</name>
+        <rename>id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>subpoena_id</name>
+        <rename>subpoena_id</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>created_at</name>
+        <rename>created_at</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>updated_at</name>
+        <rename>updated_at</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>vk_id</name>
+        <rename>vk_id</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>user_id</name>
+        <rename>user_id</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>user_name</name>
+        <rename>user_name</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>status</name>
+        <rename>status</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>decision_number</name>
+        <rename>decision_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>decision_date</name>
+        <rename>decision_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>decision_reason</name>
+        <rename>decision_reason</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>extra_info</name>
+        <rename>extra_info</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>type</name>
+        <rename>type</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>recruitment_name</name>
+        <rename>recruitment_name</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+    <update_bypassed>N</update_bypassed>
+    <attributes/>
+    <GUI>
+      <xloc>944</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>postgres.subpoena</connection>
+    <execute_each_row>N</execute_each_row>
+    <sql>SELECT
+*
+FROM public.restriction_document 
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND vk_id = '${IDM_ID}'
+    AND updated_at >= '${M_R_UP_DATE}'::timestamp
+
+${LIMIT_FW}</sql>
+    <variables_active>Y</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+    <error>
+      <source_transform>Insert / update</source_transform>
+      <target_transform>Change job status on error</target_transform>
+      <is_enabled>Y</is_enabled>
+      <nr_valuename/>
+      <descriptions_valuename/>
+      <fields_valuename/>
+      <codes_valuename/>
+      <max_errors/>
+      <max_pct_errors/>
+      <min_pct_rows/>
+    </error>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow.hpl
similarity index 74%
rename from mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl
rename to mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow.hpl
index b1fa401..cddb2f7 100644
--- a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow.hpl
+++ b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>vich_flow</name>
+    <name>subpoena_appearance_flow</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,16 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 19:24:20.455</created_date>
+    <created_date>2025/08/05 14:31:22.799</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 19:24:20.455</modified_date>
+    <modified_date>2025/08/05 14:31:22.799</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
-    <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Create job execution record</from>
-      <to>vich_input</to>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +31,38 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>vich_output</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>vich_output</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>vich_output</from>
-      <to>Filter rows</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>vich_input</from>
+      <from>Table input</from>
       <to>Identify last row in a stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Identify last row in a stream</from>
+      <to>Table output</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Filter rows</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Change job status on error</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table output</from>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>592</yloc>
+      <xloc>1376</xloc>
+      <yloc>512</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>992</xloc>
-      <yloc>592</yloc>
+      <xloc>1024</xloc>
+      <yloc>512</yloc>
     </GUI>
   </transform>
   <transform>
@@ -148,8 +148,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>240</yloc>
+      <xloc>1632</xloc>
+      <yloc>160</yloc>
     </GUI>
   </transform>
   <transform>
@@ -178,7 +178,7 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <attributes/>
     <GUI>
       <xloc>288</xloc>
-      <yloc>416</yloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -194,8 +194,8 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>240</yloc>
+      <xloc>1632</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
@@ -230,15 +230,15 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1216</xloc>
-      <yloc>416</yloc>
+      <xloc>1024</xloc>
+      <yloc>160</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -248,78 +248,80 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>704</xloc>
-      <yloc>416</yloc>
+      <xloc>752</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>vich_input</name>
+    <name>Table input</name>
     <type>TableInput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>ervu-dashboard</connection>
+    <connection>postgres.subpoena</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             to_date(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' ->> 'dataSved',
-                                     'YYYY-MM-DD')                                               as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet' as vich_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       vich_elem ->> 'id'                                   AS source_id,
-       fd.source_update_date,
-       to_date(vich_elem ->> 'dataSnyat', 'YYYY-MM-DD')     AS register_date,
-       to_date(vich_elem ->> 'dataPostUchet', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(vich_arr) AS vich_elem;</sql>
+    <sql>select sa.* 
+from public.subpoena_appearance sa
+join public.subpoena s on s.id = sa.subpoena_id
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND s.department_id = '${IDM_ID}'
+    AND '${M_R_CR_DATE}' >= sa.created_date_time
+${LIMIT_FW}</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
-      <xloc>512</xloc>
-      <yloc>416</yloc>
+      <xloc>496</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>vich_output</name>
+    <name>Table output</name>
     <type>TableOutput</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>1000</commit>
     <connection>ervu-dashboard</connection>
     <fields>
       <field>
-        <column_name>recruit_id</column_name>
-        <stream_name>recruit_id</stream_name>
+        <column_name>id</column_name>
+        <stream_name>id</stream_name>
       </field>
       <field>
-        <column_name>source_id</column_name>
-        <stream_name>source_id</stream_name>
+        <column_name>subpoena_id</column_name>
+        <stream_name>subpoena_id</stream_name>
       </field>
       <field>
-        <column_name>source_update_date</column_name>
-        <stream_name>source_update_date</stream_name>
+        <column_name>fact_appearance</column_name>
+        <stream_name>fact_appearance</stream_name>
       </field>
       <field>
-        <column_name>register_date</column_name>
-        <stream_name>register_date</stream_name>
+        <column_name>date_appearance</column_name>
+        <stream_name>date_appearance</stream_name>
       </field>
       <field>
-        <column_name>deregistration_date</column_name>
-        <stream_name>deregistration_date</stream_name>
+        <column_name>nonappearance_info</column_name>
+        <stream_name>nonappearance_info</stream_name>
+      </field>
+      <field>
+        <column_name>created_date_time</column_name>
+        <stream_name>created_date_time</stream_name>
+      </field>
+      <field>
+        <column_name>change_date_time</column_name>
+        <stream_name>change_date_time</stream_name>
       </field>
     </fields>
     <ignore_errors>N</ignore_errors>
@@ -330,26 +332,26 @@ FROM filteredData fd
     <return_keys>N</return_keys>
     <schema>ervu_dashboard</schema>
     <specify_fields>Y</specify_fields>
-    <table>incapacity</table>
+    <table>subpoena_appearance</table>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
     <truncate>N</truncate>
     <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
-      <xloc>992</xloc>
-      <yloc>416</yloc>
+      <xloc>1024</xloc>
+      <yloc>320</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>vich_output</source_transform>
+      <source_transform>Table output</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
       <descriptions_valuename>error_description</descriptions_valuename>
       <fields_valuename/>
-      <codes_valuename/>
+      <codes_valuename>error_code</codes_valuename>
       <max_errors/>
       <max_pct_errors/>
       <min_pct_rows/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_delta.hpl
similarity index 72%
rename from mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl
rename to mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_delta.hpl
index 7decaf1..d772d1a 100644
--- a/mappings/info_recruits/citizen_tables/medicine/vich/parallel/vich_flow_delta.hpl
+++ b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>vich_flow_delta</name>
+    <name>subpoena_appearance_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,26 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:36:38.686</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:36:38.686</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>vich_input</to>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +41,28 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Identify last row in a stream</from>
-      <to>vich_upsert</to>
+      <to>Insert / update</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>vich_input</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>vich_upsert</from>
-      <to>Change job status on error</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>vich_upsert</from>
+      <from>Insert / update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1744</xloc>
-      <yloc>560</yloc>
+      <xloc>1168</xloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1520</xloc>
-      <yloc>560</yloc>
+      <xloc>944</xloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -148,8 +148,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1744</xloc>
-      <yloc>208</yloc>
+      <xloc>1248</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
@@ -174,14 +174,14 @@ and recruitment_id = '${IDM_ID}';
     <sql>UPDATE etl.job_execution  
 SET
     status = 'DELTA_PROCESSING',
-    execution_datetime = current_timestamp,
+    execution_datetime = DEFAULT,
     error_description = NULL
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>816</xloc>
-      <yloc>384</yloc>
+      <xloc>336</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +197,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>1232</xloc>
-      <yloc>208</yloc>
+      <xloc>1248</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +233,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1744</xloc>
-      <yloc>384</yloc>
+      <xloc>944</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,108 +251,116 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>1232</xloc>
-      <yloc>384</yloc>
+      <xloc>736</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>vich_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             to_date(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' ->> 'dataSved',
-                                     'YYYY-MM-DD')                                               as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet' as vich_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' -> 'svedUchet') = 'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-                        and to_date(ri.info -> 'svedFL' -> 'svedUchetVICH' -> 'svedVICH' ->> 'dataSved', 'YYYY-MM-DD') > '${MAX_SOURCE_UPDATE_DATE}'
-                      )
-SELECT fd.recruit_id,
-       vich_elem ->> 'id'                                   AS source_id,
-       fd.source_update_date,
-       to_date(vich_elem ->> 'dataSnyat', 'YYYY-MM-DD')     AS register_date,
-       to_date(vich_elem ->> 'dataPostUchet', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(vich_arr) AS vich_elem;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>1040</xloc>
-      <yloc>384</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>vich_upsert</name>
+    <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>id</field>
+        <name>id</name>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>created_date_time</field>
+        <name>created_date_time</name>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>disability</table>
+      <table>subpoena_appearance</table>
       <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
+        <name>id</name>
+        <rename>id</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
+        <name>created_date_time</name>
+        <rename>created_date_time</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>subpoena_id</name>
+        <rename>subpoena_id</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
+        <name>fact_appearance</name>
+        <rename>fact_appearance</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
+        <name>date_appearance</name>
+        <rename>date_appearance</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>nonappearance_info</name>
+        <rename>nonappearance_info</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>change_date_time</name>
+        <rename>change_date_time</rename>
         <update>Y</update>
       </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>1520</xloc>
-      <yloc>384</yloc>
+      <xloc>944</xloc>
+      <yloc>224</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>postgres.subpoena</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit/>
+    <sql>select sa.* 
+from public.subpoena_appearance sa
+join public.subpoena s on s.id = sa.subpoena_id
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND s.department_id = '${IDM_ID}'
+    AND sa.change_date_time >= '${M_R_UP_DATE}'::timestamp
+
+${LIMIT_FW}</sql>
+    <variables_active>Y</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>vich_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename/>
       <fields_valuename/>
       <codes_valuename/>
       <max_errors/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_repeat.hpl
similarity index 71%
rename from mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl
rename to mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_repeat.hpl
index 3d10789..2e0ee69 100644
--- a/mappings/info_recruits/citizen_tables/medicine/incapacity/parallel/incapacity_flow_repeat.hpl
+++ b/mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_repeat.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>incapacity_flow_repeat</name>
+    <name>subpoena_appearance_flow_repeat</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,21 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 20:32:10.265</created_date>
+    <created_date>2025/08/08 13:25:52.319</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 20:32:10.265</modified_date>
+    <modified_date>2025/08/08 13:25:52.319</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>incapacity_input</to>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +36,33 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>incapacity_input</from>
-      <to>Identify last row in a stream</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Identify last row in a stream</from>
-      <to>incapacity_upsert</to>
+      <to>Insert / update</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>incapacity_upsert</from>
+      <from>Insert / update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>incapacity_upsert</from>
-      <to>Change job status on error</to>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>640</yloc>
+      <xloc>1248</xloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -117,8 +117,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1120</xloc>
-      <yloc>640</yloc>
+      <xloc>960</xloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -148,8 +148,8 @@ and recruitment_id = '${IDM_ID}';
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>256</yloc>
+      <xloc>1440</xloc>
+      <yloc>48</yloc>
     </GUI>
   </transform>
   <transform>
@@ -171,17 +171,32 @@ and recruitment_id = '${IDM_ID}';
     <replace_variables>Y</replace_variables>
     <set_params>N</set_params>
     <single_statement>N</single_statement>
-    <sql>UPDATE etl.job_execution  
-SET
+    <sql>INSERT INTO etl.job_execution (
+    id,
+    job_name,
+    status,
+    execution_datetime,
+    error_description,
+    recruitment_id
+)
+VALUES (
+    DEFAULT,
+    '${JOB_NAME}',
+    'PROCESSING',
+    DEFAULT,
+    NULL,
+    '${IDM_ID}'
+)
+ON CONFLICT (job_name, recruitment_id)
+DO UPDATE SET
     status = 'PROCESSING',
-    execution_datetime = current_timestamp,
+    execution_datetime = DEFAULT,
     error_description = NULL
-where job_name = '${JOB_NAME}'
-and recruitment_id = '${IDM_ID}';</sql>
+</sql>
     <attributes/>
     <GUI>
-      <xloc>416</xloc>
-      <yloc>432</yloc>
+      <xloc>272</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +212,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>256</yloc>
+      <xloc>1440</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +248,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1344</xloc>
-      <yloc>432</yloc>
+      <xloc>960</xloc>
+      <yloc>48</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,118 +266,115 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>832</xloc>
-      <yloc>432</yloc>
+      <xloc>720</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>incapacity_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (
-    SELECT ri.recruit_id,
-           ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob' as nedeesposob_arr
-    FROM recruits_info ri
-    WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') = 'array'
-      AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
-)
-SELECT fd.recruit_id,
-       nedeesposob_elem ->> 'id'                                AS source_id,
-       to_date(nedeesposob_elem ->> 'dataSved', 'YYYY-MM-DD')   AS source_update_date,
-       nedeesposob_elem ->> 'naimStatus'                        AS capacity_status,
-       nedeesposob_elem ->> 'naimOrg'                           AS court_name,
-       to_date(nedeesposob_elem ->> 'dataPrisv', 'YYYY-MM-DD')  AS register_date,
-       to_date(nedeesposob_elem ->> 'dataOkonch', 'YYYY-MM-DD') AS deregistration_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(fd.nedeesposob_arr -> 'svedFL' -> 'svedNedeesp' -> 'nedeesposob') AS nedeesposob_elem;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>640</xloc>
-      <yloc>432</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>incapacity_upsert</name>
+    <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>id</field>
+        <name>id</name>
+      </key>
+      <key>
+        <condition>=</condition>
+        <field>created_date_time</field>
+        <name>created_date_time</name>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>disability</table>
+      <table>subpoena_appearance</table>
       <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
+        <name>id</name>
+        <rename>id</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
+        <name>created_date_time</name>
+        <rename>created_date_time</rename>
         <update>N</update>
       </value>
       <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>subpoena_id</name>
+        <rename>subpoena_id</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>capacity_status</name>
-        <rename>capacity_status</rename>
+        <name>fact_appearance</name>
+        <rename>fact_appearance</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>court_name</name>
-        <rename>court_name</rename>
+        <name>date_appearance</name>
+        <rename>date_appearance</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>register_date</name>
-        <rename>register_date</rename>
+        <name>nonappearance_info</name>
+        <rename>nonappearance_info</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>deregistration_date</name>
-        <rename>deregistration_date</rename>
+        <name>change_date_time</name>
+        <rename>change_date_time</rename>
         <update>Y</update>
       </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>1120</xloc>
-      <yloc>432</yloc>
+      <xloc>960</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>N</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>postgres.subpoena</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit/>
+    <sql>select sa.* 
+from public.subpoena_appearance sa
+join public.subpoena s on s.id = sa.subpoena_id
+WHERE 
+    '${IDM_ID}' != ''  -- Проверка на пустую строку
+    AND s.department_id = '${IDM_ID}'
+    AND '${M_R_CR_DATE}' >= sa.created_date_time
+${LIMIT_FW}</sql>
+    <variables_active>Y</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>480</xloc>
+      <yloc>208</yloc>
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>incapacity_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename/>
       <fields_valuename/>
       <codes_valuename/>
       <max_errors/>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl b/mappings/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl
similarity index 68%
rename from mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl
rename to mappings/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl
index 73d920b..2bc3a65 100644
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl
+++ b/mappings/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>health_state_flow_repeat</name>
+    <name>subpoena_send_info_flow_delta</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,21 +13,26 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/08 21:48:46.051</created_date>
+    <created_date>2025/08/11 13:22:56.048</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/08 21:48:46.051</modified_date>
+    <modified_date>2025/08/11 13:22:56.048</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>Change job status on error</from>
-      <to>Abort</to>
+      <from>Create job execution record</from>
+      <to>Table input</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Create job execution record</from>
-      <to>health_state_input</to>
+      <from>Table input</from>
+      <to>Identify last row in a stream</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Detect empty stream</from>
+      <to>Change job status on success</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
@@ -36,33 +41,28 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Identify last row in a stream</from>
-      <to>Detect empty stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>health_state_input</from>
-      <to>Identify last row in a stream</to>
+      <from>Change job status on error</from>
+      <to>Abort</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
       <from>Identify last row in a stream</from>
-      <to>health_state_upsert</to>
+      <to>Insert / update</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>health_state_upsert</from>
+      <from>Insert / update</from>
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>health_state_upsert</from>
-      <to>Change job status on error</to>
+      <from>Insert / update</from>
+      <to>Detect empty stream</to>
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>Detect empty stream</from>
-      <to>Change job status on success</to>
+      <from>Insert / update</from>
+      <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
   </order>
@@ -77,13 +77,13 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <abort_option>ABORT</abort_option>
+    <abort_option>ABORT_WITH_ERROR</abort_option>
     <always_log_rows>Y</always_log_rows>
     <row_threshold>0</row_threshold>
     <attributes/>
     <GUI>
       <xloc>1168</xloc>
-      <yloc>640</yloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -109,7 +109,7 @@
     <set_params>Y</set_params>
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution
-SET status = 'ERROR',
+SET status = 'DELTA_ERROR',
     error_description = ?
 WHERE job_name = '${JOB_NAME}' 
 and recruitment_id = '${IDM_ID}';
@@ -118,7 +118,7 @@ and recruitment_id = '${IDM_ID}';
     <attributes/>
     <GUI>
       <xloc>944</xloc>
-      <yloc>640</yloc>
+      <yloc>400</yloc>
     </GUI>
   </transform>
   <transform>
@@ -141,15 +141,15 @@ and recruitment_id = '${IDM_ID}';
     <set_params>N</set_params>
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution
-SET status = 'SUCCESS'
+SET status = 'DELTA_SUCCESS'
 WHERE job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';
 
 </sql>
     <attributes/>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>272</yloc>
+      <xloc>1248</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
@@ -173,15 +173,15 @@ and recruitment_id = '${IDM_ID}';
     <single_statement>N</single_statement>
     <sql>UPDATE etl.job_execution  
 SET
-    status = 'PROCESSING',
-    execution_datetime = current_timestamp,
+    status = 'DELTA_PROCESSING',
+    execution_datetime = DEFAULT,
     error_description = NULL
 where job_name = '${JOB_NAME}'
 and recruitment_id = '${IDM_ID}';</sql>
     <attributes/>
     <GUI>
-      <xloc>240</xloc>
-      <yloc>448</yloc>
+      <xloc>336</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -197,8 +197,8 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <attributes/>
     <GUI>
-      <xloc>656</xloc>
-      <yloc>272</yloc>
+      <xloc>1248</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
@@ -233,15 +233,15 @@ and recruitment_id = '${IDM_ID}';</sql>
     <send_true_to>Change job status on success</send_true_to>
     <attributes/>
     <GUI>
-      <xloc>1168</xloc>
-      <yloc>448</yloc>
+      <xloc>944</xloc>
+      <yloc>64</yloc>
     </GUI>
   </transform>
   <transform>
     <name>Identify last row in a stream</name>
     <type>DetectLastRow</type>
     <description/>
-    <distribute>N</distribute>
+    <distribute>Y</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
@@ -251,89 +251,99 @@ and recruitment_id = '${IDM_ID}';</sql>
     <resultfieldname>last_row</resultfieldname>
     <attributes/>
     <GUI>
-      <xloc>656</xloc>
-      <yloc>448</yloc>
+      <xloc>736</xloc>
+      <yloc>224</yloc>
     </GUI>
   </transform>
   <transform>
-    <name>health_state_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit/>
-    <sql>WITH filteredData AS (SELECT ri.recruit_id,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' ->> 'dataSved'  as source_update_date,
-                             ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov' as zdorov_arr
-                      FROM recruits_info ri
-                      WHERE jsonb_typeof(ri.info -> 'svedFL' -> 'svedSostZdorov' -> 'svedZdorov' -> 'sostZdorov') =
-                            'array'
-                        and COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}')
-SELECT fd.recruit_id,
-       zdorov_elem ->> 'id'                               AS source_id,
-       source_update_date,
-       zdorov_elem ->> 'kodZabol'                         AS disease_code,
-       to_date(zdorov_elem ->> 'dataDiagn', 'YYYY-MM-DD') AS diagnosis_date
-FROM filteredData fd
-         CROSS JOIN LATERAL jsonb_array_elements(zdorov_arr) AS zdorov_elem;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>464</xloc>
-      <yloc>448</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>health_state_upsert</name>
+    <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
-    <distribute>Y</distribute>
+    <distribute>N</distribute>
     <custom_distribution/>
     <copies>1</copies>
     <partitioning>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>source_id</field>
-        <name>source_id</name>
+        <field>id</field>
+        <name>id</name>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>health_state</table>
+      <table>subpoena_send_info</table>
       <value>
-        <name>recruit_id</name>
-        <rename>recruit_id</rename>
+        <name>id</name>
+        <rename>id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>subpoena_id</name>
+        <rename>subpoena_id</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>source_id</name>
-        <rename>source_id</rename>
+        <name>send_code</name>
+        <rename>send_code</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>source_update_date</name>
-        <rename>source_update_date</rename>
+        <name>send_address</name>
+        <rename>send_address</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disease_code</name>
-        <rename>disease_code</rename>
+        <name>send_address_type</name>
+        <rename>send_address_type</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>diagnosis_date</name>
-        <rename>diagnosis_date</rename>
+        <name>send_date</name>
+        <rename>send_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>track_number</name>
+        <rename>track_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>is_delivered</name>
+        <rename>is_delivered</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>delivery_code</name>
+        <rename>delivery_code</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>delivery_date</name>
+        <rename>delivery_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>act_number</name>
+        <rename>act_number</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>act_date</name>
+        <rename>act_date</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>delivery_fio</name>
+        <rename>delivery_fio</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>auto_delivery</name>
+        <rename>auto_delivery</rename>
         <update>Y</update>
       </value>
     </lookup>
@@ -341,7 +351,6 @@ FROM filteredData fd
     <attributes/>
     <GUI>
       <xloc>944</xloc>
-<<<<<<< HEAD:mappings/info_recruits/raw_data/subpoena_appearance/parallel/subpoena_appearance_flow_delta.hpl
       <yloc>224</yloc>
     </GUI>
   </transform>
@@ -359,32 +368,28 @@ FROM filteredData fd
     <connection>postgres.subpoena</connection>
     <execute_each_row>N</execute_each_row>
     <limit/>
-    <sql>select sa.* 
-from public.subpoena_appearance sa
-join public.subpoena s on s.id = sa.subpoena_id
+    <sql>select ssi.* 
+from public.subpoena_send_info ssi
+join public.subpoena s on s.id = ssi.subpoena_id
 WHERE 
     '${IDM_ID}' != ''  -- Проверка на пустую строку
     AND s.department_id = '${IDM_ID}'
-    AND sa.change_date_time >= '${M_SA_UP_DATE}'::timestamp
-
+    AND s.status_change_date >= '${M_R_UP_DATE}'::timestamp
 ${LIMIT_FW}</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
       <xloc>544</xloc>
       <yloc>224</yloc>
-=======
-      <yloc>448</yloc>
->>>>>>> 10bcf8dc200fb1b4ce7b6f5b82d5b8cd20b5b935:mappings/info_recruits/citizen_tables/medicine/health_state/parallel/health_state_flow_repeat.hpl
     </GUI>
   </transform>
   <transform_error_handling>
     <error>
-      <source_transform>health_state_upsert</source_transform>
+      <source_transform>Insert / update</source_transform>
       <target_transform>Change job status on error</target_transform>
       <is_enabled>Y</is_enabled>
       <nr_valuename/>
-      <descriptions_valuename>error_description</descriptions_valuename>
+      <descriptions_valuename/>
       <fields_valuename/>
       <codes_valuename/>
       <max_errors/>
diff --git a/mappings/info_recruits/raw_data/subpoena_send_info/recruitment_five_flow_delta.hpl b/mappings/info_recruits/raw_data/subpoena_send_info/recruitment_five_flow_delta.hpl
new file mode 100644
index 0000000..befe783
--- /dev/null
+++ b/mappings/info_recruits/raw_data/subpoena_send_info/recruitment_five_flow_delta.hpl
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pipeline>
+  <info>
+    <name>recruitment_five_flow_delta</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/08/11 13:16:11.204</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/08/11 13:16:11.204</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>Table input</from>
+      <to>subpoena_send_info_flow_delta.hpl</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>subpoena_send_info_flow_delta.hpl 2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>subpoena_send_info_flow_delta.hpl 3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>subpoena_send_info_flow_delta.hpl 4</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Table input</from>
+      <to>subpoena_send_info_flow_delta.hpl 5</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu-dashboard</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit>0</limit>
+    <sql>SELECT
+    r.idm_id as recruitment_id
+FROM ervu_dashboard.recruitment r
+         LEFT JOIN etl.job_execution je
+                   ON r.idm_id = je.recruitment_id
+                       and job_name = 'subpoena_send_info_job'
+where je.status in ('SUCCESS', 'DELTA_ERROR', 'DELTA_SUCCESS', 'DELTA_PROCESSING');</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>352</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>subpoena_send_info_flow_delta.hpl</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>subpoena_send_info_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>624</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>subpoena_send_info_flow_delta.hpl 2</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>subpoena_send_info_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>624</xloc>
+      <yloc>208</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>subpoena_send_info_flow_delta.hpl 3</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>subpoena_send_info_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>624</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>subpoena_send_info_flow_delta.hpl 4</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>subpoena_send_info_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>624</xloc>
+      <yloc>368</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>subpoena_send_info_flow_delta.hpl 5</name>
+    <type>PipelineExecutor</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <run_configuration>local</run_configuration>
+    <filename>${PROJECT_HOME}/info_recruits/raw_data/subpoena_send_info/parallel/subpoena_send_info_flow_delta.hpl</filename>
+    <filenameInField>N</filenameInField>
+    <filenameField/>
+    <group_size>1</group_size>
+    <group_field/>
+    <group_time/>
+    <parameters>
+      <variable_mapping>
+        <variable>IDM_ID</variable>
+        <field>recruitment_id</field>
+        <input/>
+      </variable_mapping>
+      <variable_mapping>
+        <variable>JOB_NAME</variable>
+        <field/>
+        <input>subpoena_send_info_job</input>
+      </variable_mapping>
+      <inherit_all_vars>Y</inherit_all_vars>
+    </parameters>
+    <execution_result_target_transform/>
+    <execution_time_field>ExecutionTime</execution_time_field>
+    <execution_result_field>ExecutionResult</execution_result_field>
+    <execution_errors_field>ExecutionNrErrors</execution_errors_field>
+    <execution_lines_read_field>ExecutionLinesRead</execution_lines_read_field>
+    <execution_lines_written_field>ExecutionLinesWritten</execution_lines_written_field>
+    <execution_lines_input_field>ExecutionLinesInput</execution_lines_input_field>
+    <execution_lines_output_field>ExecutionLinesOutput</execution_lines_output_field>
+    <execution_lines_rejected_field>ExecutionLinesRejected</execution_lines_rejected_field>
+    <execution_lines_updated_field>ExecutionLinesUpdated</execution_lines_updated_field>
+    <execution_lines_deleted_field>ExecutionLinesDeleted</execution_lines_deleted_field>
+    <execution_files_retrieved_field>ExecutionFilesRetrieved</execution_files_retrieved_field>
+    <execution_exit_status_field>ExecutionExitStatus</execution_exit_status_field>
+    <execution_log_text_field>ExecutionLogText</execution_log_text_field>
+    <execution_log_channelid_field>ExecutionLogChannelId</execution_log_channelid_field>
+    <result_rows_target_transform/>
+    <result_files_target_transform/>
+    <result_files_file_name_field>FileName</result_files_file_name_field>
+    <executors_output_transform/>
+    <attributes/>
+    <GUI>
+      <xloc>624</xloc>
+      <yloc>448</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow_repeat.hpl b/mappings/info_recruits/reference_data/recruit_archivation_reason.hpl
similarity index 55%
rename from mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow_repeat.hpl
rename to mappings/info_recruits/reference_data/recruit_archivation_reason.hpl
index 0eb4d87..2bc6733 100644
--- a/mappings/info_recruits/citizen_tables/medicine/health_state/constants/health_state_constants_flow_repeat.hpl
+++ b/mappings/info_recruits/reference_data/recruit_archivation_reason.hpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pipeline>
   <info>
-    <name>health_state_constants_flow_repeat</name>
+    <name>recruit_archivation_reason</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
@@ -13,81 +13,21 @@
     <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
     <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
     <created_user>-</created_user>
-    <created_date>2025/09/22 17:34:05.067</created_date>
+    <created_date>2025/09/09 16:35:56.339</created_date>
     <modified_user>-</modified_user>
-    <modified_date>2025/09/22 17:34:05.067</modified_date>
+    <modified_date>2025/09/09 16:35:56.339</modified_date>
   </info>
   <notepads>
   </notepads>
   <order>
     <hop>
-      <from>get_max_disease_update_date</from>
-      <to>disease_input</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>disease_input</from>
-      <to>minobr_disease_upsert</to>
+      <from>Table input</from>
+      <to>Insert / update</to>
       <enabled>Y</enabled>
     </hop>
   </order>
   <transform>
-    <name>disease_input</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>nsi</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <lookup>get_max_disease_update_date</lookup>
-    <sql>SELECT
-    key as code,
-    value ->> 'value' as value,
-    NOT hidden as actual,
-    updated_at as update_date
-FROM classifier_records
-WHERE code = 'diseaseCode'
-AND updated_at > ?;</sql>
-    <variables_active>Y</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>448</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>get_max_disease_update_date</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>ervu-dashboard</connection>
-    <execute_each_row>N</execute_each_row>
-    <limit>0</limit>
-    <sql>SELECT
-       max(update_date) as max_update_date
-FROM disease;
-</sql>
-    <variables_active>N</variables_active>
-    <attributes/>
-    <GUI>
-      <xloc>224</xloc>
-      <yloc>256</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>minobr_disease_upsert</name>
+    <name>Insert / update</name>
     <type>InsertUpdate</type>
     <description/>
     <distribute>Y</distribute>
@@ -97,43 +37,86 @@ FROM disease;
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <commit>10000</commit>
+    <commit>100</commit>
     <connection>ervu-dashboard</connection>
     <lookup>
       <key>
         <condition>=</condition>
-        <field>code</field>
-        <name>code</name>
+        <field>id</field>
+        <name>id</name>
         <name2/>
       </key>
       <schema>ervu_dashboard</schema>
-      <table>disease</table>
-      <value>
-        <name>code</name>
-        <rename>code</rename>
-        <update>N</update>
-      </value>
+      <table>recruit_archivation_reason</table>
       <value>
         <name>value</name>
         <rename>value</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>actual</name>
-        <rename>actual</rename>
+        <name>code</name>
+        <rename>code</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>update_date</name>
-        <rename>update_date</rename>
+        <name>created_at</name>
+        <rename>created_at</rename>
         <update>Y</update>
       </value>
+      <value>
+        <name>updated_at</name>
+        <rename>updated_at</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>description</name>
+        <rename>description</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>extra_info</name>
+        <rename>extra_info</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>hidden</name>
+        <rename>hidden</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>id</name>
+        <rename>id</rename>
+        <update>N</update>
+      </value>
     </lookup>
     <update_bypassed>N</update_bypassed>
     <attributes/>
     <GUI>
-      <xloc>640</xloc>
-      <yloc>256</yloc>
+      <xloc>848</xloc>
+      <yloc>288</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Table input</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>ervu_person_archive</connection>
+    <execute_each_row>N</execute_each_row>
+    <limit>0</limit>
+    <sql>SELECT * 
+from public.recruit_archivation_reason</sql>
+    <variables_active>N</variables_active>
+    <attributes/>
+    <GUI>
+      <xloc>480</xloc>
+      <yloc>288</yloc>
     </GUI>
   </transform>
   <transform_error_handling>