From 284f36f801bcaf7e06b37b010dcf2fc4c896ef93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Tue, 11 Apr 2023 13:36:42 +0900
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=B4=97=E6=9B=BF=E7=94=A8?=
 =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90=E3=81=AE=E5=AE=9F?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stored_procedure/inst_merge_t_create.sql  | 48 ++++++++++++++
 .../v_inst_merge_t_create.sql                 | 65 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 rds_mysql/stored_procedure/inst_merge_t_create.sql
 create mode 100644 rds_mysql/stored_procedure/v_inst_merge_t_create.sql

diff --git a/rds_mysql/stored_procedure/inst_merge_t_create.sql b/rds_mysql/stored_procedure/inst_merge_t_create.sql
new file mode 100644
index 00000000..4f7e1b44
--- /dev/null
+++ b/rds_mysql/stored_procedure/inst_merge_t_create.sql
@@ -0,0 +1,48 @@
+-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
+CREATE PROCEDURE src05.inst_merge_t_create()
+SQL SECURITY INVOKER
+BEGIN
+	-- 例外処理
+	-- エラーが発生した場合に一時テーブルの削除を実施
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
+		BEGIN
+			GET DIAGNOSTICS CONDITION 1
+				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+			ROLLBACK;
+			SIGNAL SQLSTATE '45000'
+				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
+		END;
+
+	SET @error_state = NULL, @error_msg = NULL;
+	START TRANSACTION;
+
+	TRUNCATE TABLE internal05.inst_merge_t;
+
+	INSERT INTO
+		internal05.inst_merge_t (
+			dcf_dsf_inst_cd,
+			dup_opp_cd,
+			form_inst_name_kanji,
+			form_inst_name_kana,
+			inst_addr,
+			prefc_cd
+		)
+	SELECT 
+		di.dcf_inst_cd,
+		di.dcf_inst_cd_new,
+		ci.form_inst_name_kanji,
+		ci.form_inst_name_kana,
+		ci.inst_addr,
+		ci.prefc_cd
+	FROM 
+		dcf_inst_merge di
+	LEFT OUTER JOIN com_inst ci
+		ON di.dcf_inst_cd_new = ci.dcf_dsf_inst_cd
+	WHERE
+		ci.delete_flg = '0'
+		AND	STR_TO_DATE(di.tekiyo_month, '%Y%m') <= (SELECT STR_TO_DATE(syor_date, '%Y%m%d') FROM hdke_tbl) 
+		AND	di.muko_flg = '0'
+		AND	di.enabled_flg = 'Y';
+
+	COMMIT;
+END
diff --git a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
new file mode 100644
index 00000000..bbc05090
--- /dev/null
+++ b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
@@ -0,0 +1,65 @@
+-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
+CREATE PROCEDURE src05.v_inst_merge_t_create()
+SQL SECURITY INVOKER
+BEGIN
+	-- 例外処理
+	-- エラーが発生した場合に一時テーブルの削除を実施
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
+		BEGIN
+			GET DIAGNOSTICS CONDITION 1
+				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+			ROLLBACK;
+			SIGNAL SQLSTATE '45000'
+				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
+		END;
+
+	SET @error_state = NULL, @error_msg = NULL;
+	START TRANSACTION;
+
+	TRUNCATE TABLE internal05.v_inst_merge_t;
+
+	INSERT INTO
+		internal05.v_inst_merge_t (
+			v_inst_cd,
+			v_inst_cd_merge,
+			fcl_name,
+			fcl_kn_name,
+			fmt_addr,
+			prft_cd
+		)
+	SELECT
+		vv.v_inst_cd,
+		vv.v_inst_cd_merg,
+		fv.fcl_name,
+		fv.fcl_kn_name,
+		fv.fmt_addr,
+		fv.prft_cd
+	FROM
+		src05.vop_hco_merge_v vv,
+		src05.fcl_mst_v fv
+	INNER JOIN (
+		SELECT
+			v_inst_cd,
+			MAX(sub_num) AS sno
+		FROM
+			src05.fcl_mst_v
+		GROUP BY
+			v_inst_cd
+		) fmv1
+		ON fv.v_inst_cd = fmv1.v_inst_cd
+		AND fv.sub_num = fmv1.sno
+	WHERE
+		vv.v_inst_cd_merg = fv.v_inst_cd
+		AND STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') <= (
+			SELECT
+				STR_TO_DATE(syor_date, '%Y%m%d')
+			FROM
+				src05.hdke_tbl
+			)
+		AND ((fcl_type IN ('A1','A0')) OR fcl_type BETWEEN '20' AND '29')
+		AND fv.rec_sts_kbn != '9'
+	ORDER BY 
+		STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') ASC;
+
+	COMMIT;
+END

From 4e97b0b38e89bd7b42b4b4e22a2abca363e71f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Wed, 12 Apr 2023 15:15:15 +0900
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stored_procedure/inst_merge_t_create.sql  | 21 +++++-----
 .../v_inst_merge_t_create.sql                 | 38 ++++++++-----------
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/rds_mysql/stored_procedure/inst_merge_t_create.sql b/rds_mysql/stored_procedure/inst_merge_t_create.sql
index 4f7e1b44..b6a2bcca 100644
--- a/rds_mysql/stored_procedure/inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/inst_merge_t_create.sql
@@ -3,7 +3,6 @@ CREATE PROCEDURE src05.inst_merge_t_create()
 SQL SECURITY INVOKER
 BEGIN
 	-- 例外処理
-	-- エラーが発生した場合に一時テーブルの削除を実施
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
@@ -14,7 +13,6 @@ BEGIN
 		END;
 
 	SET @error_state = NULL, @error_msg = NULL;
-	START TRANSACTION;
 
 	TRUNCATE TABLE internal05.inst_merge_t;
 
@@ -28,21 +26,20 @@ BEGIN
 			prefc_cd
 		)
 	SELECT 
-		di.dcf_inst_cd,
-		di.dcf_inst_cd_new,
+		dim.dcf_inst_cd,
+		dim.dcf_inst_cd_new,
 		ci.form_inst_name_kanji,
 		ci.form_inst_name_kana,
 		ci.inst_addr,
 		ci.prefc_cd
 	FROM 
-		dcf_inst_merge di
-	LEFT OUTER JOIN com_inst ci
-		ON di.dcf_inst_cd_new = ci.dcf_dsf_inst_cd
+		src05.dcf_inst_merge dim
+	LEFT OUTER JOIN src05.com_inst ci
+		ON dim.dcf_inst_cd_new = ci.dcf_dsf_inst_cd
 	WHERE
-		ci.delete_flg = '0'
-		AND	STR_TO_DATE(di.tekiyo_month, '%Y%m') <= (SELECT STR_TO_DATE(syor_date, '%Y%m%d') FROM hdke_tbl) 
-		AND	di.muko_flg = '0'
-		AND	di.enabled_flg = 'Y';
+			ci.delete_flg = '0'
+		AND	src05.to_date_yyyymm01(dim.tekiyo_month) <= src05.get_syor_date() 
+		AND	dim.muko_flg = '0'
+		AND	dim.enabled_flg = 'Y';
 
-	COMMIT;
 END
diff --git a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
index bbc05090..7f8006cc 100644
--- a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
@@ -3,7 +3,6 @@ CREATE PROCEDURE src05.v_inst_merge_t_create()
 SQL SECURITY INVOKER
 BEGIN
 	-- 例外処理
-	-- エラーが発生した場合に一時テーブルの削除を実施
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION 
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
@@ -14,7 +13,6 @@ BEGIN
 		END;
 
 	SET @error_state = NULL, @error_msg = NULL;
-	START TRANSACTION;
 
 	TRUNCATE TABLE internal05.v_inst_merge_t;
 
@@ -28,15 +26,15 @@ BEGIN
 			prft_cd
 		)
 	SELECT
-		vv.v_inst_cd,
-		vv.v_inst_cd_merg,
-		fv.fcl_name,
-		fv.fcl_kn_name,
-		fv.fmt_addr,
-		fv.prft_cd
+		vhmv.v_inst_cd,
+		vhmv.v_inst_cd_merg,
+		fmv.fcl_name,
+		fmv.fcl_kn_name,
+		fmv.fmt_addr,
+		fmv.prft_cd
 	FROM
-		src05.vop_hco_merge_v vv,
-		src05.fcl_mst_v fv
+		src05.vop_hco_merge_v vhmv,
+		src05.fcl_mst_v fmv
 	INNER JOIN (
 		SELECT
 			v_inst_cd,
@@ -45,21 +43,15 @@ BEGIN
 			src05.fcl_mst_v
 		GROUP BY
 			v_inst_cd
-		) fmv1
-		ON fv.v_inst_cd = fmv1.v_inst_cd
-		AND fv.sub_num = fmv1.sno
+		) max_sno_fmv
+		ON fmv.v_inst_cd = max_sno_fmv.v_inst_cd
+		AND fmv.sub_num = max_sno_fmv.sno
 	WHERE
-		vv.v_inst_cd_merg = fv.v_inst_cd
-		AND STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') <= (
-			SELECT
-				STR_TO_DATE(syor_date, '%Y%m%d')
-			FROM
-				src05.hdke_tbl
-			)
+		vhmv.v_inst_cd_merg = fmv.v_inst_cd
+		AND STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') <= src05.get_syor_date()
 		AND ((fcl_type IN ('A1','A0')) OR fcl_type BETWEEN '20' AND '29')
-		AND fv.rec_sts_kbn != '9'
+		AND fmv.rec_sts_kbn != '9'
 	ORDER BY 
-		STR_TO_DATE(vv.apply_dt, '%Y-%m-%d') ASC;
+		STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') ASC;
 
-	COMMIT;
 END

From 4cc3c10a7aca4da5e303bd14def7ee428438d161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Wed, 12 Apr 2023 15:48:35 +0900
Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rds_mysql/stored_procedure/inst_merge_t_create.sql   | 1 -
 rds_mysql/stored_procedure/v_inst_merge_t_create.sql | 1 -
 2 files changed, 2 deletions(-)

diff --git a/rds_mysql/stored_procedure/inst_merge_t_create.sql b/rds_mysql/stored_procedure/inst_merge_t_create.sql
index b6a2bcca..62463b53 100644
--- a/rds_mysql/stored_procedure/inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/inst_merge_t_create.sql
@@ -7,7 +7,6 @@ BEGIN
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
 				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
-			ROLLBACK;
 			SIGNAL SQLSTATE '45000'
 				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
 		END;
diff --git a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
index 7f8006cc..f9b5eb30 100644
--- a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
@@ -7,7 +7,6 @@ BEGIN
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
 				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
-			ROLLBACK;
 			SIGNAL SQLSTATE '45000'
 				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
 		END;

From 7cb4535634e05e93d0124de57c89b444a395b47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Mon, 17 Apr 2023 17:56:30 +0900
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E3=83=AD=E3=82=B0=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9B=E6=A9=9F=E8=83=BD=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => src05}/inst_merge_t_create.sql       | 18 +++++++++++++++++
 .../{ => src05}/v_inst_merge_t_create.sql     | 20 +++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)
 rename rds_mysql/stored_procedure/{ => src05}/inst_merge_t_create.sql (52%)
 rename rds_mysql/stored_procedure/{ => src05}/v_inst_merge_t_create.sql (55%)

diff --git a/rds_mysql/stored_procedure/inst_merge_t_create.sql b/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
similarity index 52%
rename from rds_mysql/stored_procedure/inst_merge_t_create.sql
rename to rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
index 62463b53..3d12307a 100644
--- a/rds_mysql/stored_procedure/inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
@@ -7,14 +7,28 @@ BEGIN
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
 				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+			call medaca_common.put_error_log('internal05', 'src05.inst_merge_t_create', JSON_OBJECT(),
+									'src05.inst_merge_t_createでエラーが発生', @error_state, @error_msg);
 			SIGNAL SQLSTATE '45000'
 				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
 		END;
 
 	SET @error_state = NULL, @error_msg = NULL;
 
+	call medaca_common.put_info_log('internal05', 'src05.inst_merge_t_create', JSON_OBJECT(),
+							'アルトマーク施設統合マスタ（洗替処理一時テーブル）作成① 開始' 
+	);
+
 	TRUNCATE TABLE internal05.inst_merge_t;
 
+	call medaca_common.put_info_log('internal05', 'src05.inst_merge_t_create', JSON_OBJECT(),
+							'アルトマーク施設統合マスタ（洗替処理一時テーブル）作成① 終了' 
+	);
+
+	call medaca_common.put_info_log('internal05', 'src05.inst_merge_t_create', JSON_OBJECT(),
+							'アルトマーク施設統合マスタ（洗替処理一時テーブル）作成② 開始' 
+	);
+
 	INSERT INTO
 		internal05.inst_merge_t (
 			dcf_dsf_inst_cd,
@@ -41,4 +55,8 @@ BEGIN
 		AND	dim.muko_flg = '0'
 		AND	dim.enabled_flg = 'Y';
 
+	call medaca_common.put_info_log('internal05', 'src05.inst_merge_t_create', JSON_OBJECT(),
+							'アルトマーク施設統合マスタ（洗替処理一時テーブル）作成② 終了' 
+	);
+
 END
diff --git a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql b/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
similarity index 55%
rename from rds_mysql/stored_procedure/v_inst_merge_t_create.sql
rename to rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
index f9b5eb30..665c4ec5 100644
--- a/rds_mysql/stored_procedure/v_inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
@@ -7,14 +7,25 @@ BEGIN
 		BEGIN
 			GET DIAGNOSTICS CONDITION 1
 				@error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+			call medaca_common.put_error_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(),
+									'src05.v_inst_merge_t_createでエラーが発生', @error_state, @error_msg);
 			SIGNAL SQLSTATE '45000'
 				SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
 		END;
 
 	SET @error_state = NULL, @error_msg = NULL;
 
+	call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(),
+							'【洗替】３：HCO施設コードの洗替① 開始');
+
 	TRUNCATE TABLE internal05.v_inst_merge_t;
 
+	call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(),
+							'【洗替】３：HCO施設コードの洗替① 終了');
+
+	call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(),
+							'【洗替】３：HCO施設コードの洗替② 開始');
+
 	INSERT INTO
 		internal05.v_inst_merge_t (
 			v_inst_cd,
@@ -48,9 +59,10 @@ BEGIN
 	WHERE
 		vhmv.v_inst_cd_merg = fmv.v_inst_cd
 		AND STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') <= src05.get_syor_date()
-		AND ((fcl_type IN ('A1','A0')) OR fcl_type BETWEEN '20' AND '29')
-		AND fmv.rec_sts_kbn != '9'
-	ORDER BY 
-		STR_TO_DATE(vhmv.apply_dt, '%Y-%m-%d') ASC;
+		AND ((fmv.fcl_type IN ('A1','A0')) OR fmv.fcl_type BETWEEN '20' AND '29')
+		AND fmv.rec_sts_kbn != '9';
+
+	call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(),
+							'【洗替】３：HCO施設コードの洗替② 終了' );
 
 END

From f3e8c5a0670befc11788aedce770be866a86a6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Tue, 18 Apr 2023 10:47:44 +0900
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E6=B4=97=E3=81=84=E6=9B=BF?=
 =?UTF-8?q?=E3=81=88=E7=94=A8=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E7=94=A8=E3=81=AEpython=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/batch/datachange/res_mak_inst_lau.py  | 20 +++++++++++++++
 .../src/batch/jissekiaraigae.py               | 25 +++++++++++--------
 ecs/jskult-batch-daily/src/db/database.py     |  5 +++-
 3 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py

diff --git a/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py
new file mode 100644
index 00000000..bfd359a1
--- /dev/null
+++ b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py
@@ -0,0 +1,20 @@
+from src.db.database import Database
+from src.error.exceptions import BatchOperationException
+from src.logging.get_logger import get_logger
+
+logger = get_logger('実績洗替')
+
+
+def batch_process():
+    db = Database.get_instance()
+    try:
+        db.connect()
+    except Exception as e:
+        logger.info("実績洗替 データベース接続に失敗")
+        raise BatchOperationException(e)
+
+    logger.info('実績洗替 開始')
+    db.execute('CALL src05.v_inst_merge_t_create()')
+    db.execute('CALL src05.inst_merge_t_create()')
+    db.disconnect()
+    logger.info('実績洗替 終了')
diff --git a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
index 7f5d9fcf..93895f77 100644
--- a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
+++ b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py
@@ -1,11 +1,14 @@
-from src.batch.datachange import emp_chg_inst_lau
-from src.logging.get_logger import get_logger
-
-logger = get_logger('実績洗替')
-
-
-def batch_process():
-    """実績洗替処理"""
-    logger.info('Start Jisseki Araigae Batch PGM.')
-    # 施設担当者洗替
-    emp_chg_inst_lau.batch_process()
+from src.batch.datachange import emp_chg_inst_lau
+from src.batch.datachange import res_mak_inst_lau
+from src.logging.get_logger import get_logger
+
+logger = get_logger('実績洗替')
+
+
+def batch_process():
+    """実績洗替処理"""
+    logger.info('Start Jisseki Araigae Batch PGM.')
+    # 洗替用マスタ作成
+    res_mak_inst_lau.batch_process()
+    # 施設担当者洗替
+    emp_chg_inst_lau.batch_process()
diff --git a/ecs/jskult-batch-daily/src/db/database.py b/ecs/jskult-batch-daily/src/db/database.py
index 7e8f845c..0317bc21 100644
--- a/ecs/jskult-batch-daily/src/db/database.py
+++ b/ecs/jskult-batch-daily/src/db/database.py
@@ -83,7 +83,10 @@ class Database:
         Raises:
             DBException: 接続失敗
         """
-        self.__connection = self.__engine.connect()
+        try:
+            self.__connection = self.__engine.connect()
+        except Exception as e:
+            raise DBException(e)
 
     def execute_select(self, select_query: str, parameters=None) -> list[dict]:
         """SELECTクエリを実行します。

From 73a234462a7b9511a6813c4e5bcc46876d1e0418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Tue, 18 Apr 2023 14:48:21 +0900
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stored_procedure/src05/v_inst_merge_t_create.sql      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql b/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
index d550d121..fb609b8c 100644
--- a/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/src05/v_inst_merge_t_create.sql
@@ -23,15 +23,15 @@ BEGIN
 	SET @error_state = NULL, @error_msg = NULL;
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
-							'【洗替】３：HCO施設コードの洗替① 開始');
+							'V施設統合マスタ（洗替処理一時テーブル）作成① 開始');
 
 	TRUNCATE TABLE internal05.v_inst_merge_t;
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
-							'【洗替】３：HCO施設コードの洗替① 終了');
+							'V施設統合マスタ（洗替処理一時テーブル）作成① 終了');
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
-							'【洗替】３：HCO施設コードの洗替② 開始');
+							'V施設統合マスタ（洗替処理一時テーブル）作成② 開始');
 
 	INSERT INTO
 		internal05.v_inst_merge_t (
@@ -70,6 +70,6 @@ BEGIN
 		AND fmv.rec_sts_kbn != '9';
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
-							'【洗替】３：HCO施設コードの洗替② 終了' );
+							'V施設統合マスタ（洗替処理一時テーブル）作成② 終了' );
 
 END

From 81e1fc8abb5e5df82e2867d6bbea3db56d38c438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Wed, 19 Apr 2023 10:25:25 +0900
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E4=BE=8B=E5=A4=96=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=81=AE=E6=A8=AA=E5=B1=95=E9=96=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datachange/create_inst_merge_for_laundering.py  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ecs/jskult-batch-daily/src/batch/datachange/create_inst_merge_for_laundering.py b/ecs/jskult-batch-daily/src/batch/datachange/create_inst_merge_for_laundering.py
index 2e03188f..f631d460 100644
--- a/ecs/jskult-batch-daily/src/batch/datachange/create_inst_merge_for_laundering.py
+++ b/ecs/jskult-batch-daily/src/batch/datachange/create_inst_merge_for_laundering.py
@@ -10,14 +10,15 @@ def batch_process():
 
     try:
         db.connect()
+
+        logger.debug('処理開始')
+        call_v_inst_merge_t_create(db)
+        call_inst_merge_t_create(db)
+        logger.debug('処理終了')
     except Exception as e:
         raise BatchOperationException(e)
-
-    logger.info('処理開始')
-    call_v_inst_merge_t_create(db)
-    call_inst_merge_t_create(db)
-    db.disconnect()
-    logger.info('処理終了')
+    finally:    
+        db.disconnect()
 
 
 def call_v_inst_merge_t_create(db: Database):

From 102e3318e4de5750b138a2a613d7875716644b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Thu, 20 Apr 2023 13:35:46 +0900
Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=E6=96=BD=E8=A8=AD=E6=8B=85?=
 =?UTF-8?q?=E5=BD=93=E8=80=85=E3=83=9E=E3=82=B9=E3=82=BF=E6=B4=97=E6=9B=BF?=
 =?UTF-8?q?=E3=81=AE=E5=8B=95=E4=BD=9C=E3=81=AB=E5=A4=89=E5=8C=96=E3=81=8C?=
 =?UTF-8?q?=E7=94=9F=E3=81=98=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=80=81inst=5Fmerge=5Ft=5Fcreate=E3=83=97=E3=83=AD=E3=82=B7?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A3=E3=83=BC=E3=81=AESQL=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rds_mysql/stored_procedure/src05/inst_merge_t_create.sql | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql b/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
index 0afdedad..74472fcc 100644
--- a/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
+++ b/rds_mysql/stored_procedure/src05/inst_merge_t_create.sql
@@ -56,11 +56,12 @@ BEGIN
 		src05.dcf_inst_merge dim
 	LEFT OUTER JOIN src05.com_inst ci
 		ON dim.dcf_inst_cd_new = ci.dcf_dsf_inst_cd
+		AND ci.delete_flg = '0'
 	WHERE
-			ci.delete_flg = '0'
-		AND	src05.to_date_yyyymm01(dim.tekiyo_month) <= src05.get_syor_date() 
-		AND	dim.muko_flg = '0'
-		AND	dim.enabled_flg = 'Y';
+			dim.muko_flg = '0'
+		AND dim.dcf_inst_cd_new IS NOT NULL
+		AND	dim.enabled_flg = 'Y'
+		AND	src05.to_date_yyyymm01(dim.tekiyo_month) <= src05.get_syor_date();
 
 	call medaca_common.put_info_log(schema_name, procedure_name, procedure_args,
 							'アルトマーク施設統合マスタ（洗替処理一時テーブル）作成② 終了'