diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index d6d9642b..aac57921 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -182,10 +182,10 @@ class MstInstAll(JskultBatchEntrypoint): ci.inst_div_cd, LEFT(cid.inst_div_name, 40), null, - ci.create_user, - ci.regist_date, - ci.update_user, - ci.update_date + ci.regist_prgm_id, + ci.sys_regist_date, + ci.update_prgm_id, + ci.sys_update_date FROM src05.com_inst AS ci LEFT OUTER JOIN src05.mst_prefc AS mp @@ -254,10 +254,10 @@ class MstInstAll(JskultBatchEntrypoint): cp.inst_div_cd, LEFT(cid.inst_div_name, 40), null, - cp.create_user, - cp.regist_date, - cp.update_user, - cp.update_date + cp.regist_prgm_id, + cp.sys_regist_date, + cp.update_prgm_id, + cp.sys_update_date FROM src05.com_pharm AS cp LEFT OUTER JOIN src05.mst_prefc AS mp @@ -319,7 +319,7 @@ class MstInstAll(JskultBatchEntrypoint): mim.jis_city_cd, mjp.jis_pref_nm_kj, LEFT(mjc.jis_city_nm_kj, 40), - CONCAT(mim.addr1_nm_kj, mim.addr2_nm_kj), + CONCAT_WS('', mim.addr1_nm_kj, mim.addr2_nm_kj), mim.postal_no, mim.tel_no, null, @@ -327,7 +327,7 @@ class MstInstAll(JskultBatchEntrypoint): null, CASE mim.eff_end_ym WHEN '999912' THEN null - ELSE CONCAT(mim.eff_end_ym, DATE_FORMAT(LAST_DAY(STR_TO_DATE(mim.eff_end_ym, '%Y%m')), '%d')) + ELSE CONCAT(LAST_DAY(STR_TO_DATE(CONCAT(mim.eff_end_ym, '01'), '%Y%m%d'))) END, null, null,