From 5eecb51dbb7563c95b68d6878e4bc22eb5e5e7b9 Mon Sep 17 00:00:00 2001
From: Ravindran Seshadri <109151953+rseshadri99@users.noreply.github.com>
Date: Sun, 9 Mar 2025 00:21:43 -0500
Subject: [PATCH 1/3] Add the dyn datamart procedure for organization data post
 processing. This procedure migrates the classic etl to rtr framework with
 event based Ids to be processed and removes any reference to odse

Add the dyn datamart procedure for organization data post processing.
This procedure migrates the classic etl to rtr framework with event based Ids to be processed and removes any reference to odse
---
 ...135-sp_dyn_dm_org_data_post_processing.sql | 459 ++++++++++++++++++
 .../db.rdb_modern.changelog-16.1.yaml         |  10 +-
 ...sp_dyn_dm_org_data_post_processing-001.sql | 459 ++++++++++++++++++
 3 files changed, 927 insertions(+), 1 deletion(-)
 create mode 100644 db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql
 create mode 100644 liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql

diff --git a/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql b/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql
new file mode 100644
index 00000000..09f5f1b7
--- /dev/null
+++ b/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql
@@ -0,0 +1,459 @@
+
+
+
+CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_post_processing
+ 
+            @batch_id BIGINT,
+			@DATAMART_NAME VARCHAR(100),
+			@Org_id_list nvarchar(max)
+			
+	AS
+BEGIN  
+	 BEGIN TRY
+	
+--DECLARE  @batch_id BIGINT = 999;  DECLARE @DATAMART_NAME  VARCHAR(100) = 'CONG_SYPHILIS';
+	
+		DECLARE @RowCount_no INT = 0  ;
+		DECLARE @Proc_Step_no FLOAT = 0 ;
+		DECLARE @Proc_Step_Name VARCHAR(200) = '' ;
+		DECLARE @batch_start_time datetime = null ;
+		DECLARE @batch_end_time datetime = null ;
+		DECLARE @nbs_page_form_cd  varchar(200)= '';
+		
+	SET @nbs_page_form_cd = (SELECT FORM_CD FROM dbo.v_nbs_page WHERE DATAMART_NM=@DATAMART_NAME)
+
+
+	SET @Proc_Step_no = 1;
+	SET @Proc_Step_Name = 'SP_Start';
+
+	
+	BEGIN TRANSACTION;
+	
+   SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+	INSERT INTO dbo.job_flow_log (
+	        batch_id
+		   ,[Dataflow_Name]
+		   ,[package_Name]
+		    ,[Status_Type] 
+           ,[step_number]
+           ,[step_name]
+          ,[row_count]
+           )
+		   VALUES
+           (
+		   @batch_id
+           ,'DYNAMIC_DATAMART'
+           ,'RDB.DBO.DynDm_OrgData_sp ' + @DATAMART_NAME
+		   ,'START'
+		   ,@Proc_Step_no
+		   ,@Proc_Step_Name
+           ,0
+		   );
+  
+    
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  FACT_CASE';
+	
+	
+
+	BEGIN TRANSACTION;
+
+
+
+      declare @countstd int = 0;
+
+
+	   select  @COUNTSTD =   count(*) from dbo.v_nrt_nbs_d_case_mgmt_rdb_table_metadata
+        ;
+
+
+		  declare @FACT_CASE varchar(40) = '';
+
+
+		  if @countstd > 1
+			 begin
+			  set @FACT_CASE = 'F_STD_PAGE_CASE';
+			end
+		  else 
+			 begin
+			  set @FACT_CASE = 'F_PAGE_CASE';
+			 end
+		  ;
+
+ -- select @fact_case;
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name ,@ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_Organization_METADATA';
+	
+
+--CREATE TABLE ORGANIZATION_METADATA  AS 
+    
+	Select RDB_COLUMN_NM, user_defined_column_nm, part_type_cd, [Key], Detail, QEC, UID, INVESTIGATION_FORM_CD
+	into #tmp_DynDm_Organization_METADATA
+	from v_nrt_nbs_d_organization_rdb_table_metadata
+	where INVESTIGATION_FORM_CD=@nbs_page_form_cd ;
+
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+ INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name , @ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_Organization';
+	
+
+
+     IF OBJECT_ID('#tmp_DynDm_Organization', 'U') IS NOT NULL   
+ 				drop table #tmp_DynDm_Organization;
+
+
+--CREATE TABLE rdb.dbo.tmp_DynDm_Organization 
+--(INVESTIGATION_KEY bigint);
+
+select distinct investigation_key,
+cast(null as bigint) as ORGANIZATION_UID
+into #tmp_DynDm_Organization
+ FROM #tmp_DynDm_SUMM_DATAMART
+ -- pass the org_Id_List  param
+;
+
+
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name , @ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+
+
+  declare  @USER_DEFINED_COLUMN_NM varchar(max) ,@PART_TYPE_CD  varchar(max) ,@DETAIL  varchar(max) ,@QEC  varchar(max) ,@UID varchar(max);
+
+
+
+
+ declare @SQL varchar(max)
+
+
+
+ --DX select PART_TYPE_CD,*  from rdb.dbo.tmp_DynDm_Organization_METADATA;
+
+
+ 
+
+--declare @PART_TYPE_CD varchar(max) = null , @SQL varchar(max);
+
+
+
+DECLARE db_cursor_org CURSOR LOCAL FOR 
+ select PART_TYPE_CD , [key],DETAIL,QEC ,[UID] from #tmp_DynDm_Organization_METADATA;
+
+OPEN db_cursor_org  
+FETCH NEXT FROM db_cursor_org INTO @PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID
+
+WHILE @@FETCH_STATUS = 0  
+BEGIN  
+      
+
+	  
+  
+
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_OrgPart_Table_temp';
+	
+					 IF OBJECT_ID('dbo.tmp_DynDm_OrgPart_Table_temp', 'U') IS NOT NULL   
+ 								drop table dbo.tmp_DynDm_OrgPart_Table_temp;
+
+
+
+				CREATE TABLE [dbo].[tmp_DynDm_OrgPart_Table_temp](
+					[ORGANIZATION_KEY] [bigint] NULL,
+					[ORGANIZATION_QUICK_CODE] [varchar](50) NULL,
+					[ORGANIZATION_NAME] [varchar](50) NULL,
+					[ORGANIZATION_LOCAL_ID] [varchar](50) NULL,
+					[ORGANIZATION_UID] [bigint] NULL,
+					[ORGANIZATION_STREET_ADDRESS_1] [varchar](50) NULL,
+					[ORGANIZATION_STREET_ADDRESS_2] [varchar](50) NULL,
+					[ORGANIZATION_CITY] [varchar](50) NULL,
+					[ORGANIZATION_STATE] [varchar](50) NULL,
+					[ORGANIZATION_ZIP] [varchar](10) NULL,
+					[ORGANIZATION_COUNTY] [varchar](50) NULL,
+					[ORGANIZATION_PHONE_WORK] [varchar](50) NULL,
+					[ORGANIZATION_PHONE_EXT_WORK] [varchar](50) NULL,
+					[PART_TYPE_CD] [bigint] NULL,
+					[PART_TYPE_CD_NM] varchar(100),
+					[CITY_STATE_ZIP] varchar(2000),
+					[DETAIL] varchar(2000),
+					[INVESTIGATION_KEY] [bigint] NOT NULL
+				)
+				;	  
+				-- if @FACT_CASE = ""
+						SET @SQL = ' insert into dbo.tmp_DynDm_OrgPart_Table_temp '
+						   + ' ([ORGANIZATION_KEY] '
+						   + ', [ORGANIZATION_QUICK_CODE] '
+						   + ', [ORGANIZATION_NAME] '
+						   + ', [ORGANIZATION_LOCAL_ID] '
+						   + ', [ORGANIZATION_UID] '
+						   + ', [ORGANIZATION_STREET_ADDRESS_1] '
+						   + ', [ORGANIZATION_STREET_ADDRESS_2] '
+						   + ', [ORGANIZATION_CITY] '
+						   + ', [ORGANIZATION_STATE] '
+						   + ', [ORGANIZATION_ZIP] '
+						   + ', [ORGANIZATION_COUNTY] '
+						   + ', [ORGANIZATION_PHONE_WORK] '
+						   + ', [ORGANIZATION_PHONE_EXT_WORK] '
+						   + ', [PART_TYPE_CD] '
+						   + ', [PART_TYPE_CD_NM] '
+						   + ', [CITY_STATE_ZIP] '
+						   + ', [DETAIL] '
+						   + ', [INVESTIGATION_KEY] )'
+						+ ' SELECT  distinct '+ 
+						' (d_o.ORGANIZATION_KEY)   ,  '+
+						' d_o.ORGANIZATION_QUICK_CODE ,  '+
+						' d_o.ORGANIZATION_NAME ,  '+
+						' d_o.ORGANIZATION_LOCAL_ID ,  '+ 
+						' d_o.ORGANIZATION_UID ,  '+
+						' d_o.ORGANIZATION_STREET_ADDRESS_1 ,  '+
+						' d_o.ORGANIZATION_STREET_ADDRESS_2 ,  '+
+						' d_o.ORGANIZATION_CITY ,  '+
+						' d_o.ORGANIZATION_STATE ,  '+ 
+						' d_o.ORGANIZATION_ZIP ,  '+
+						' d_o.ORGANIZATION_COUNTY ,  '+
+						' d_o.ORGANIZATION_PHONE_WORK ,  '+
+						' d_o.ORGANIZATION_PHONE_EXT_WORK ,  '+
+						   @PART_TYPE_CD +', '+
+						''''+   @PART_TYPE_CD +''', '+
+						'   coalesce( ltrim(rtrim(ORGANIZATION_CITY))+'', '','''')+coalesce( ltrim(rtrim(ORGANIZATION_STATE))+'' '','''')+coalesce( ltrim(rtrim(ORGANIZATION_ZIP)),'''') '  + 
+						' , null ,'+
+						' s_d.INVESTIGATION_KEY AS INVESTIGATION_KEY '+
+						' FROM dbo.tmp_DynDm_SUMM_DATAMART s_d '+
+						' INNER JOIN dbo.'+@FACT_CASE+ '   ON s_d.INVESTIGATION_KEY =  '+@FACT_CASE+ '.INVESTIGATION_KEY '+
+						' LEFT JOIN dbo.D_ORGANIZATION  d_o ON '+@FACT_CASE+'.'+@PART_TYPE_CD+' = d_o.ORGANIZATION_KEY  '+
+								' where d_o.organization_uid  IN (SELECT value FROM STRING_SPLIT(' + @org_id_list +','+ ','+'))' +
+						 '; '
+
+						-- select 'INSERT',@PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID, @SQL;
+
+
+							EXEC(@SQL);
+
+							
+  
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME ,'START' ,@Proc_Step_no ,@Proc_Step_Name   + '-'+@PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  UPDATE tmp_DynDm_OrgPart_Table_temp';
+	
+
+
+
+			
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET DETAIL ='<b></b>' + LTRIM(RTRIM(coalesce(ORGANIZATION_LOCAL_ID,''))) where LTRIM(RTRIM(ORGANIZATION_LOCAL_ID)) is not null ;
+
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL = DETAIL  + '<br>'  +   (ORGANIZATION_NAME)  where LTRIM(RTRIM(ORGANIZATION_NAME)) is not null ;
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_1))  where LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_1)) is not null ;
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_2))  where LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_2)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(CITY_STATE_ZIP))  where LTRIM(RTRIM(CITY_STATE_ZIP)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_COUNTY))  where LTRIM(RTRIM(ORGANIZATION_COUNTY)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK))  where LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is not null ; 
+	
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  ', ext. '  +  LTRIM(  RTRIM(ORGANIZATION_PHONE_EXT_WORK)) 
+								where  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is not null  and LTRIM(RTRIM(ORGANIZATION_PHONE_EXT_WORK)) is not null ;
+
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  '<br> ext. '  +  LTRIM(  RTRIM(ORGANIZATION_PHONE_EXT_WORK))
+								where  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is  null  and LTRIM(RTRIM(ORGANIZATION_PHONE_EXT_WORK)) is not null ;
+				
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  '<br> '  where   LTRIM(RTRIM(DETAIL)) is not null ;
+
+
+	
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name +'-'+ @PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  ALTER tmp_DynDm_OrgPart_Table_temp';
+	
+
+		
+
+
+
+							SET @SQL =  'alter table dbo.tmp_DynDm_OrgPart_Table_temp add  ' +  @DETAIL  + ' [varchar](2000) , ' +  @USER_DEFINED_COLUMN_NM+ ' bigint , '  +  @QEC+ ' [varchar](50) , ' +  @UID+ ' bigint ; '
+
+  					   -- select 'ALTER', @PART_TYPE_CD, @SQL;
+
+
+							EXEC(@SQL);
+
+
+			
+							SET @SQL =  'alter table dbo.tmp_DynDm_Organization add  ' +  @DETAIL  + ' [varchar](2000) , ' +  @USER_DEFINED_COLUMN_NM+ ' bigint , '  +  @QEC+ ' [varchar](50) , ' +  @UID+ ' bigint ; '
+
+  	   
+							EXEC(@SQL);
+
+
+
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME   ,'START' ,@Proc_Step_no ,@Proc_Step_Name + ' - '+@PART_TYPE_CD  , @ROWCOUNT_NO  );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  UPDATE tmp_DynDm_OrgPart_Table_temp';
+	
+
+
+
+
+
+						--@USER_DEFINED_COLUMN_NM=ORGANIZATION_KEY;
+						--@QEC =ORGANIZATION_QUICK_CODE;
+						--@UID= ORGANIZATION_UID;
+
+							SET @SQL =  'update tDO SET  ORGANIZATION_UID = orgtemp.ORGANIZATION_UID ,'
+									  +  @DETAIL  + ' = DETAIL , ' 
+									  +  @USER_DEFINED_COLUMN_NM+ ' =  ORGANIZATION_KEY , '  
+									  +  @QEC+ ' = ORGANIZATION_QUICK_CODE , ' 
+									  +  @UID+ ' = orgtemp.ORGANIZATION_UID '
+									  +  ' FROM dbo.tmp_DynDm_Organization  tDO '
+									  +  ' INNER JOIN dbo.tmp_DynDm_OrgPart_Table_temp orgtemp  ON  tDO.investigation_key = orgtemp.investigation_key '
+									  + ' ; '
+
+  					   -- select 'UPDATE', @PART_TYPE_CD, @SQL;
+
+						--select 'tmp_DynDm_OrgPart_Table_temp',* from tmp_DynDm_OrgPart_Table_temp;
+
+							EXEC(@SQL);
+
+							
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name +'-'+ @PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+
+
+      FETCH NEXT FROM db_cursor_org INTO @PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID
+
+END 
+
+CLOSE db_cursor_org  
+DEALLOCATE db_cursor_org
+;
+
+
+
+
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'SP_COMPLETE';
+
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+
+
+
+
+
+
+COMMIT TRANSACTION;
+
+
+    END TRY
+            BEGIN CATCH
+						IF @@TRANCOUNT > 0
+						BEGIN
+							ROLLBACK TRANSACTION;
+						END;
+						DECLARE @ErrorNumber int= ERROR_NUMBER();
+						DECLARE @ErrorLine int= ERROR_LINE();
+						DECLARE @ErrorMessage nvarchar(4000)= ERROR_MESSAGE();
+						DECLARE @ErrorSeverity int= ERROR_SEVERITY();
+						DECLARE @ErrorState int= ERROR_STATE();
+
+                        select @ErrorMessage;
+
+						INSERT INTO dbo.job_flow_log( batch_id, [Dataflow_Name], [package_Name], [Status_Type], [step_number], [step_name], [Error_Description], [row_count] )
+						VALUES( @Batch_id, 'DYNAMIC_DATAMART', 'RDB.DBO.DynDm_OrgData_sp', 'ERROR', @Proc_Step_no, 'ERROR - '+@Proc_Step_name, 'Step -'+CAST(@Proc_Step_no AS varchar(3))+' -'+CAST(@ErrorMessage AS varchar(500)), 0 );
+						RETURN -1;
+	        END CATCH;
+END;
+
diff --git a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
index 736174ee..edf96732 100644
--- a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
+++ b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
@@ -1054,4 +1054,12 @@ databaseChangeLog:
       changes:
         - sqlFile:
             path: 060-create-summary-report-case-001.sql
-            splitStatements: false
\ No newline at end of file
+            splitStatements: false
+  - changeSet:
+      id: 157
+      author: liquibase
+      runOnChange: true
+      changes:
+        - sqlFile:
+            path: 135-sp_dyn_dm_org_data_post_processing-001.sql
+            splitStatements: false
diff --git a/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql b/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql
new file mode 100644
index 00000000..09f5f1b7
--- /dev/null
+++ b/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql
@@ -0,0 +1,459 @@
+
+
+
+CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_post_processing
+ 
+            @batch_id BIGINT,
+			@DATAMART_NAME VARCHAR(100),
+			@Org_id_list nvarchar(max)
+			
+	AS
+BEGIN  
+	 BEGIN TRY
+	
+--DECLARE  @batch_id BIGINT = 999;  DECLARE @DATAMART_NAME  VARCHAR(100) = 'CONG_SYPHILIS';
+	
+		DECLARE @RowCount_no INT = 0  ;
+		DECLARE @Proc_Step_no FLOAT = 0 ;
+		DECLARE @Proc_Step_Name VARCHAR(200) = '' ;
+		DECLARE @batch_start_time datetime = null ;
+		DECLARE @batch_end_time datetime = null ;
+		DECLARE @nbs_page_form_cd  varchar(200)= '';
+		
+	SET @nbs_page_form_cd = (SELECT FORM_CD FROM dbo.v_nbs_page WHERE DATAMART_NM=@DATAMART_NAME)
+
+
+	SET @Proc_Step_no = 1;
+	SET @Proc_Step_Name = 'SP_Start';
+
+	
+	BEGIN TRANSACTION;
+	
+   SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+	INSERT INTO dbo.job_flow_log (
+	        batch_id
+		   ,[Dataflow_Name]
+		   ,[package_Name]
+		    ,[Status_Type] 
+           ,[step_number]
+           ,[step_name]
+          ,[row_count]
+           )
+		   VALUES
+           (
+		   @batch_id
+           ,'DYNAMIC_DATAMART'
+           ,'RDB.DBO.DynDm_OrgData_sp ' + @DATAMART_NAME
+		   ,'START'
+		   ,@Proc_Step_no
+		   ,@Proc_Step_Name
+           ,0
+		   );
+  
+    
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  FACT_CASE';
+	
+	
+
+	BEGIN TRANSACTION;
+
+
+
+      declare @countstd int = 0;
+
+
+	   select  @COUNTSTD =   count(*) from dbo.v_nrt_nbs_d_case_mgmt_rdb_table_metadata
+        ;
+
+
+		  declare @FACT_CASE varchar(40) = '';
+
+
+		  if @countstd > 1
+			 begin
+			  set @FACT_CASE = 'F_STD_PAGE_CASE';
+			end
+		  else 
+			 begin
+			  set @FACT_CASE = 'F_PAGE_CASE';
+			 end
+		  ;
+
+ -- select @fact_case;
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name ,@ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_Organization_METADATA';
+	
+
+--CREATE TABLE ORGANIZATION_METADATA  AS 
+    
+	Select RDB_COLUMN_NM, user_defined_column_nm, part_type_cd, [Key], Detail, QEC, UID, INVESTIGATION_FORM_CD
+	into #tmp_DynDm_Organization_METADATA
+	from v_nrt_nbs_d_organization_rdb_table_metadata
+	where INVESTIGATION_FORM_CD=@nbs_page_form_cd ;
+
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+ INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name , @ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_Organization';
+	
+
+
+     IF OBJECT_ID('#tmp_DynDm_Organization', 'U') IS NOT NULL   
+ 				drop table #tmp_DynDm_Organization;
+
+
+--CREATE TABLE rdb.dbo.tmp_DynDm_Organization 
+--(INVESTIGATION_KEY bigint);
+
+select distinct investigation_key,
+cast(null as bigint) as ORGANIZATION_UID
+into #tmp_DynDm_Organization
+ FROM #tmp_DynDm_SUMM_DATAMART
+ -- pass the org_Id_List  param
+;
+
+
+
+  
+SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+ VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name , @ROWCOUNT_NO );
+  
+		
+	
+    COMMIT TRANSACTION;
+	
+	
+
+
+  declare  @USER_DEFINED_COLUMN_NM varchar(max) ,@PART_TYPE_CD  varchar(max) ,@DETAIL  varchar(max) ,@QEC  varchar(max) ,@UID varchar(max);
+
+
+
+
+ declare @SQL varchar(max)
+
+
+
+ --DX select PART_TYPE_CD,*  from rdb.dbo.tmp_DynDm_Organization_METADATA;
+
+
+ 
+
+--declare @PART_TYPE_CD varchar(max) = null , @SQL varchar(max);
+
+
+
+DECLARE db_cursor_org CURSOR LOCAL FOR 
+ select PART_TYPE_CD , [key],DETAIL,QEC ,[UID] from #tmp_DynDm_Organization_METADATA;
+
+OPEN db_cursor_org  
+FETCH NEXT FROM db_cursor_org INTO @PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID
+
+WHILE @@FETCH_STATUS = 0  
+BEGIN  
+      
+
+	  
+  
+
+    BEGIN TRANSACTION;
+	
+	SET @Proc_Step_no = @Proc_Step_no + 1;
+	SET @Proc_Step_Name = 'GENERATING  tmp_DynDm_OrgPart_Table_temp';
+	
+					 IF OBJECT_ID('dbo.tmp_DynDm_OrgPart_Table_temp', 'U') IS NOT NULL   
+ 								drop table dbo.tmp_DynDm_OrgPart_Table_temp;
+
+
+
+				CREATE TABLE [dbo].[tmp_DynDm_OrgPart_Table_temp](
+					[ORGANIZATION_KEY] [bigint] NULL,
+					[ORGANIZATION_QUICK_CODE] [varchar](50) NULL,
+					[ORGANIZATION_NAME] [varchar](50) NULL,
+					[ORGANIZATION_LOCAL_ID] [varchar](50) NULL,
+					[ORGANIZATION_UID] [bigint] NULL,
+					[ORGANIZATION_STREET_ADDRESS_1] [varchar](50) NULL,
+					[ORGANIZATION_STREET_ADDRESS_2] [varchar](50) NULL,
+					[ORGANIZATION_CITY] [varchar](50) NULL,
+					[ORGANIZATION_STATE] [varchar](50) NULL,
+					[ORGANIZATION_ZIP] [varchar](10) NULL,
+					[ORGANIZATION_COUNTY] [varchar](50) NULL,
+					[ORGANIZATION_PHONE_WORK] [varchar](50) NULL,
+					[ORGANIZATION_PHONE_EXT_WORK] [varchar](50) NULL,
+					[PART_TYPE_CD] [bigint] NULL,
+					[PART_TYPE_CD_NM] varchar(100),
+					[CITY_STATE_ZIP] varchar(2000),
+					[DETAIL] varchar(2000),
+					[INVESTIGATION_KEY] [bigint] NOT NULL
+				)
+				;	  
+				-- if @FACT_CASE = ""
+						SET @SQL = ' insert into dbo.tmp_DynDm_OrgPart_Table_temp '
+						   + ' ([ORGANIZATION_KEY] '
+						   + ', [ORGANIZATION_QUICK_CODE] '
+						   + ', [ORGANIZATION_NAME] '
+						   + ', [ORGANIZATION_LOCAL_ID] '
+						   + ', [ORGANIZATION_UID] '
+						   + ', [ORGANIZATION_STREET_ADDRESS_1] '
+						   + ', [ORGANIZATION_STREET_ADDRESS_2] '
+						   + ', [ORGANIZATION_CITY] '
+						   + ', [ORGANIZATION_STATE] '
+						   + ', [ORGANIZATION_ZIP] '
+						   + ', [ORGANIZATION_COUNTY] '
+						   + ', [ORGANIZATION_PHONE_WORK] '
+						   + ', [ORGANIZATION_PHONE_EXT_WORK] '
+						   + ', [PART_TYPE_CD] '
+						   + ', [PART_TYPE_CD_NM] '
+						   + ', [CITY_STATE_ZIP] '
+						   + ', [DETAIL] '
+						   + ', [INVESTIGATION_KEY] )'
+						+ ' SELECT  distinct '+ 
+						' (d_o.ORGANIZATION_KEY)   ,  '+
+						' d_o.ORGANIZATION_QUICK_CODE ,  '+
+						' d_o.ORGANIZATION_NAME ,  '+
+						' d_o.ORGANIZATION_LOCAL_ID ,  '+ 
+						' d_o.ORGANIZATION_UID ,  '+
+						' d_o.ORGANIZATION_STREET_ADDRESS_1 ,  '+
+						' d_o.ORGANIZATION_STREET_ADDRESS_2 ,  '+
+						' d_o.ORGANIZATION_CITY ,  '+
+						' d_o.ORGANIZATION_STATE ,  '+ 
+						' d_o.ORGANIZATION_ZIP ,  '+
+						' d_o.ORGANIZATION_COUNTY ,  '+
+						' d_o.ORGANIZATION_PHONE_WORK ,  '+
+						' d_o.ORGANIZATION_PHONE_EXT_WORK ,  '+
+						   @PART_TYPE_CD +', '+
+						''''+   @PART_TYPE_CD +''', '+
+						'   coalesce( ltrim(rtrim(ORGANIZATION_CITY))+'', '','''')+coalesce( ltrim(rtrim(ORGANIZATION_STATE))+'' '','''')+coalesce( ltrim(rtrim(ORGANIZATION_ZIP)),'''') '  + 
+						' , null ,'+
+						' s_d.INVESTIGATION_KEY AS INVESTIGATION_KEY '+
+						' FROM dbo.tmp_DynDm_SUMM_DATAMART s_d '+
+						' INNER JOIN dbo.'+@FACT_CASE+ '   ON s_d.INVESTIGATION_KEY =  '+@FACT_CASE+ '.INVESTIGATION_KEY '+
+						' LEFT JOIN dbo.D_ORGANIZATION  d_o ON '+@FACT_CASE+'.'+@PART_TYPE_CD+' = d_o.ORGANIZATION_KEY  '+
+								' where d_o.organization_uid  IN (SELECT value FROM STRING_SPLIT(' + @org_id_list +','+ ','+'))' +
+						 '; '
+
+						-- select 'INSERT',@PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID, @SQL;
+
+
+							EXEC(@SQL);
+
+							
+  
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME ,'START' ,@Proc_Step_no ,@Proc_Step_Name   + '-'+@PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  UPDATE tmp_DynDm_OrgPart_Table_temp';
+	
+
+
+
+			
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET DETAIL ='<b></b>' + LTRIM(RTRIM(coalesce(ORGANIZATION_LOCAL_ID,''))) where LTRIM(RTRIM(ORGANIZATION_LOCAL_ID)) is not null ;
+
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL = DETAIL  + '<br>'  +   (ORGANIZATION_NAME)  where LTRIM(RTRIM(ORGANIZATION_NAME)) is not null ;
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_1))  where LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_1)) is not null ;
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_2))  where LTRIM(RTRIM(ORGANIZATION_STREET_ADDRESS_2)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(CITY_STATE_ZIP))  where LTRIM(RTRIM(CITY_STATE_ZIP)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_COUNTY))  where LTRIM(RTRIM(ORGANIZATION_COUNTY)) is not null ; 
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL=  DETAIL  + '<br>'  +  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK))  where LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is not null ; 
+	
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  ', ext. '  +  LTRIM(  RTRIM(ORGANIZATION_PHONE_EXT_WORK)) 
+								where  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is not null  and LTRIM(RTRIM(ORGANIZATION_PHONE_EXT_WORK)) is not null ;
+
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  '<br> ext. '  +  LTRIM(  RTRIM(ORGANIZATION_PHONE_EXT_WORK))
+								where  LTRIM(RTRIM(ORGANIZATION_PHONE_WORK)) is  null  and LTRIM(RTRIM(ORGANIZATION_PHONE_EXT_WORK)) is not null ;
+				
+								update dbo.tmp_DynDm_OrgPart_Table_temp SET  DETAIL= DETAIL +  '<br> '  where   LTRIM(RTRIM(DETAIL)) is not null ;
+
+
+	
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name +'-'+ @PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  ALTER tmp_DynDm_OrgPart_Table_temp';
+	
+
+		
+
+
+
+							SET @SQL =  'alter table dbo.tmp_DynDm_OrgPart_Table_temp add  ' +  @DETAIL  + ' [varchar](2000) , ' +  @USER_DEFINED_COLUMN_NM+ ' bigint , '  +  @QEC+ ' [varchar](50) , ' +  @UID+ ' bigint ; '
+
+  					   -- select 'ALTER', @PART_TYPE_CD, @SQL;
+
+
+							EXEC(@SQL);
+
+
+			
+							SET @SQL =  'alter table dbo.tmp_DynDm_Organization add  ' +  @DETAIL  + ' [varchar](2000) , ' +  @USER_DEFINED_COLUMN_NM+ ' bigint , '  +  @QEC+ ' [varchar](50) , ' +  @UID+ ' bigint ; '
+
+  	   
+							EXEC(@SQL);
+
+
+
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME   ,'START' ,@Proc_Step_no ,@Proc_Step_Name + ' - '+@PART_TYPE_CD  , @ROWCOUNT_NO  );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'GENERATING  UPDATE tmp_DynDm_OrgPart_Table_temp';
+	
+
+
+
+
+
+						--@USER_DEFINED_COLUMN_NM=ORGANIZATION_KEY;
+						--@QEC =ORGANIZATION_QUICK_CODE;
+						--@UID= ORGANIZATION_UID;
+
+							SET @SQL =  'update tDO SET  ORGANIZATION_UID = orgtemp.ORGANIZATION_UID ,'
+									  +  @DETAIL  + ' = DETAIL , ' 
+									  +  @USER_DEFINED_COLUMN_NM+ ' =  ORGANIZATION_KEY , '  
+									  +  @QEC+ ' = ORGANIZATION_QUICK_CODE , ' 
+									  +  @UID+ ' = orgtemp.ORGANIZATION_UID '
+									  +  ' FROM dbo.tmp_DynDm_Organization  tDO '
+									  +  ' INNER JOIN dbo.tmp_DynDm_OrgPart_Table_temp orgtemp  ON  tDO.investigation_key = orgtemp.investigation_key '
+									  + ' ; '
+
+  					   -- select 'UPDATE', @PART_TYPE_CD, @SQL;
+
+						--select 'tmp_DynDm_OrgPart_Table_temp',* from tmp_DynDm_OrgPart_Table_temp;
+
+							EXEC(@SQL);
+
+							
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name +'-'+ @PART_TYPE_CD  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+
+
+      FETCH NEXT FROM db_cursor_org INTO @PART_TYPE_CD ,@USER_DEFINED_COLUMN_NM,@DETAIL ,@QEC ,@UID
+
+END 
+
+CLOSE db_cursor_org  
+DEALLOCATE db_cursor_org
+;
+
+
+
+
+	
+									BEGIN TRANSACTION;
+	
+									SET @Proc_Step_no = @Proc_Step_no + 1;
+									SET @Proc_Step_Name = 'SP_COMPLETE';
+
+								SELECT @ROWCOUNT_NO = @@ROWCOUNT; 
+
+  						  	 INSERT INTO dbo.job_flow_log ( batch_id ,[Dataflow_Name] ,[package_Name] ,[Status_Type] ,[step_number] ,[step_name] ,[row_count] ) 
+								 VALUES ( @batch_id ,'DYNAMIC_DATAMART' ,'RDB.DBO.DynDm_OrgData_sp '+@DATAMART_NAME  ,'START' ,@Proc_Step_no ,@Proc_Step_Name  , @ROWCOUNT_NO );
+  
+		
+	
+									COMMIT TRANSACTION;
+	
+	
+
+
+
+
+
+
+COMMIT TRANSACTION;
+
+
+    END TRY
+            BEGIN CATCH
+						IF @@TRANCOUNT > 0
+						BEGIN
+							ROLLBACK TRANSACTION;
+						END;
+						DECLARE @ErrorNumber int= ERROR_NUMBER();
+						DECLARE @ErrorLine int= ERROR_LINE();
+						DECLARE @ErrorMessage nvarchar(4000)= ERROR_MESSAGE();
+						DECLARE @ErrorSeverity int= ERROR_SEVERITY();
+						DECLARE @ErrorState int= ERROR_STATE();
+
+                        select @ErrorMessage;
+
+						INSERT INTO dbo.job_flow_log( batch_id, [Dataflow_Name], [package_Name], [Status_Type], [step_number], [step_name], [Error_Description], [row_count] )
+						VALUES( @Batch_id, 'DYNAMIC_DATAMART', 'RDB.DBO.DynDm_OrgData_sp', 'ERROR', @Proc_Step_no, 'ERROR - '+@Proc_Step_name, 'Step -'+CAST(@Proc_Step_no AS varchar(3))+' -'+CAST(@ErrorMessage AS varchar(500)), 0 );
+						RETURN -1;
+	        END CATCH;
+END;
+

From f3d49b59ff313db76ed6d49a336142e769b3fb9c Mon Sep 17 00:00:00 2001
From: Ravindran Seshadri <109151953+rseshadri99@users.noreply.github.com>
Date: Sun, 9 Mar 2025 01:00:56 -0500
Subject: [PATCH 2/3] Update db.rdb_modern.changelog-16.1.yaml

liquibase change log update
---
 .../resources/db/changelog/db.rdb_modern.changelog-16.1.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
index edf96732..673bd907 100644
--- a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
+++ b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
@@ -1056,7 +1056,7 @@ databaseChangeLog:
             path: 060-create-summary-report-case-001.sql
             splitStatements: false
   - changeSet:
-      id: 157
+      id: 164
       author: liquibase
       runOnChange: true
       changes:

From e0d0c67e57fbd1048e07c73e659951d90ecb7683 Mon Sep 17 00:00:00 2001
From: Ravindran Seshadri <109151953+rseshadri99@users.noreply.github.com>
Date: Mon, 10 Mar 2025 23:59:28 -0400
Subject: [PATCH 3/3] proc name change

proc name change
---
 ...processing.sql => 135-sp_dyn_dm_org_data_postprocessing.sql} | 2 +-
 .../resources/db/changelog/db.rdb_modern.changelog-16.1.yaml    | 2 +-
 ...ng-001.sql => 135-sp_dyn_dm_org_data_postprocessing-001.sql} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename db/upgrade/rdb_modern/routines/{135-sp_dyn_dm_org_data_post_processing.sql => 135-sp_dyn_dm_org_data_postprocessing.sql} (99%)
 rename liquibase-service/src/main/resources/db/rdb_modern/routines/{135-sp_dyn_dm_org_data_post_processing-001.sql => 135-sp_dyn_dm_org_data_postprocessing-001.sql} (99%)

diff --git a/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql b/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing.sql
similarity index 99%
rename from db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql
rename to db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing.sql
index 09f5f1b7..369a6a31 100644
--- a/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing.sql
+++ b/db/upgrade/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing.sql
@@ -1,7 +1,7 @@
 
 
 
-CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_post_processing
+CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_postprocessing
  
             @batch_id BIGINT,
 			@DATAMART_NAME VARCHAR(100),
diff --git a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
index 673bd907..afa54ade 100644
--- a/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
+++ b/liquibase-service/src/main/resources/db/changelog/db.rdb_modern.changelog-16.1.yaml
@@ -1061,5 +1061,5 @@ databaseChangeLog:
       runOnChange: true
       changes:
         - sqlFile:
-            path: 135-sp_dyn_dm_org_data_post_processing-001.sql
+            path: 135-sp_dyn_dm_org_data_postprocessing-001.sql
             splitStatements: false
diff --git a/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql b/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing-001.sql
similarity index 99%
rename from liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql
rename to liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing-001.sql
index 09f5f1b7..369a6a31 100644
--- a/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_post_processing-001.sql
+++ b/liquibase-service/src/main/resources/db/rdb_modern/routines/135-sp_dyn_dm_org_data_postprocessing-001.sql
@@ -1,7 +1,7 @@
 
 
 
-CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_post_processing
+CREATE or alter PROCEDURE [dbo].sp_dyn_dm_org_data_postprocessing
  
             @batch_id BIGINT,
 			@DATAMART_NAME VARCHAR(100),