From 284f36f801bcaf7e06b37b010dcf2fc4c896ef93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 11 Apr 2023 13:36:42 +0900 Subject: [PATCH 01/69] =?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 0b0dcb4aeeb5fbdfb2164ef39c0799194e846488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 12 Apr 2023 09:27:38 +0900 Subject: [PATCH 02/69] test --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index a086a250..42724da9 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -19,7 +19,7 @@ COM_TABLE_LIST = { # COM_施設 "101": {"00": com_inst_mapper.ComInstMapper}, # COM_薬局 - "102": {"03": null_mapper.NullMapper}, + #"102": {"03": null_mapper.NullMapper}, # COM_医師勤務先 "502": {"01": com_dr_wrkplace_mapper.ComDrWrkplaceMapper}, # COM_専門分野 From 4eb85763bf8b17edc81580dfcc79a8f1271c96c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 12 Apr 2023 09:30:26 +0900 Subject: [PATCH 03/69] test2 --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index 42724da9..a086a250 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -19,7 +19,7 @@ COM_TABLE_LIST = { # COM_施設 "101": {"00": com_inst_mapper.ComInstMapper}, # COM_薬局 - #"102": {"03": null_mapper.NullMapper}, + "102": {"03": null_mapper.NullMapper}, # COM_医師勤務先 "502": {"01": com_dr_wrkplace_mapper.ComDrWrkplaceMapper}, # COM_専門分野 From 4e97b0b38e89bd7b42b4b4e22a2abca363e71f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 12 Apr 2023 15:15:15 +0900 Subject: [PATCH 04/69] =?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?= Date: Wed, 12 Apr 2023 15:48:35 +0900 Subject: [PATCH 05/69] =?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 1301aa40099dcfac64e6ef4bfceeb233dcac9b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 17 Apr 2023 16:08:03 +0900 Subject: [PATCH 06/69] =?UTF-8?q?COM=EF=BC=BF=E8=96=AC=E5=B1=80=E3=80=80?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index a086a250..b429f47e 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, null_mapper) + com_inst_mapper, com_pharm_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -19,7 +19,7 @@ COM_TABLE_LIST = { # COM_施設 "101": {"00": com_inst_mapper.ComInstMapper}, # COM_薬局 - "102": {"03": null_mapper.NullMapper}, + "102": com_pharm_mapper.ComPharmMapper, # COM_医師勤務先 "502": {"01": com_dr_wrkplace_mapper.ComDrWrkplaceMapper}, # COM_専門分野 From e39601ee401f2b38a41b2076b69cc9c2ad1ca3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 17 Apr 2023 16:09:10 +0900 Subject: [PATCH 07/69] =?UTF-8?q?COM=EF=BC=BF=E8=96=AC=E5=B1=80=E3=80=80?= =?UTF-8?q?=E6=96=B0=E8=A6=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 13 +- .../ultmarc/utmp_tables/tables/com_pharm.py | 129 ++++++++++++++++++ 2 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 753ba49f..7f99ffd0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,21 +5,18 @@ "version": "0.2.0", "configurations": [ { - "name": "Python: データ取り込みローカル実行", + "name": "Batch Sample", "type": "python", "request": "launch", - // windowsだと\区切りかも - "program": "ecs\\dataimport\\dataimport\\controller.py", + "program": "entrypoint.py", "console": "integratedTerminal", "justMyCode": true, "envFile": "${workspaceFolder}/.env" }, - { - "name": "Python: Attach using Process Id", + { "name": "Python: Current File", "type": "python", - "request": "attach", - "processId": "${command:pickProcess}", - "justMyCode": true + "request": "test", + "console": "integratedTerminal" } ] } \ No newline at end of file diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py new file mode 100644 index 00000000..3824ec3e --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py @@ -0,0 +1,129 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComPharm(UltmarcTable): + """レイアウト区分102: COM_薬局""" + dcfhp_id: str # DCF コード(ID) + dcfhp_code: str # DCF コード(コード) + dcfhp_yobi: str # DCF コード(予備) + maint_flag: str # 修正区分 + maintdate: str # メンテナンス年月日 + # 予備/転送年月日(未使用) + unconf_flg: str # 未確認フラグ + del_cd: str # 削除予定理由 + duphp_id: str # 重複時相手先コード(レコードID) + duphp_cd: str # 重複時相手先コード(施設コード) + duphp_yobi: str # 重複時相手先コード(予備) + hp_name: str # 正式施設名(漢字) + hp_name_kana: str # 正式施設名(カナ) + hp_ryaku_name: str # 略式施設名(漢字) + hp_ryaku_name_kana: str # 略式施設名(カナ) + hp_addr_lost_code: str # 住所不明 + prefc_cd: str # 住所コード(県コード) + city_cd: str # 住所コード(市区町村コード) + addrcode1: str # 住所コード(大字・通称コード) + addrcode2: str # 住所コード(字・丁目コード) + zip_code: str # 郵便番号 + addr: str # 住所(漢字) + addr_kana: str # 住所(カナ) + addr_number: str # 住所表示番号 + addrkanjcnt1: str # 住所文字カウント:漢字(県) + addrkanjcnt2: str # 住所文字カウント:漢字(市区町村) + addrkanjcnt3: str # 住所文字カウント:漢字(大字・通称) + addrkanjcnt4: str # 住所文字カウント:漢字(字・丁目) + addrkanacnt1: str # 住所文字カウント:カナ(県) + addrkanacnt2: str # 住所文字カウント:カナ(市区町村) + addrkanacnt3: str # 住所文字カウント:カナ(大字・通称) + addrkanacnt4: str # 住所文字カウント:カナ(字・丁目) + tel_nothing_flag: str # 電話番号なしフラグ + tel_number: str # 電話番号 + mgtclass_code: str # 経営体 + hpclass_code: str # 施設区分 + president: str # 代表者(漢字) + president_Kana: str # 代表者(カナ) + open_flag: str # 開業予定(フラグ) + open_yearmonth: str # 開業予定(年月) + close_flg: str # 休院(休院フラグ) + close_yearmonth: str # 休院(開始年月) + pharmacist: str # 管理薬剤師名(漢字) + pharmacist_kana: str # 管理薬剤師名(カナ) + franchise_hq_id: str # チェーン店本部コード(レコードID) + franchise_hq_cd: str # チェーン店本部コード(施設コード) + franchise_hq_yobi: str # チェーン店本部コード(予備) + + dcfdsf_inst_cd: str # 施設コード + village_code: str # 町字コード + addr_count_kana: str # 住所カウントカナ + addr_count: str # 住所カウント + dup_opp_cd: str # 重複時相手先コード + franchise_hq_cd: str # チェーン店本部コード + + def __init__(self, record: list[str]): + super().__init__(record) + + self.dcfhp_id = record[2] # DCF コード(ID) + self.dcfhp_cd = record[3] # DCF コード(コード) + self.dcfhp_yobi = record[4] # DCF コード(予備) + self.maint_flag = record[5] # 修正区分 + self.maintdate = record[6] # メンテナンス年月日 + # 予備/転送年月日(未使用) + self.unconf_flg = record[8].strip() # 未確認フラグ + self.del_cd = record[9].strip() # 削除予定理由 + self.duphp_id = record[10].strip() # 重複時相手先コード(レコードID) + self.duphp_cd = record[11].strip() # 重複時相手先コード(施設コード) + self.duphp_yobi = record[12].strip() # 重複時相手先コード(予備) + self.hp_name = record[13].strip() # 正式施設名(漢字) + self.hp_name_kana = record[14].strip() # 正式施設名(カナ) + self.hp_ryaku_name = record[15].strip() # 略式施設名(漢字) + self.hp_ryaku_name_kana = record[16].strip() # 略式施設名(カナ) + self.hp_addr_lost_code = record[17].strip() # 住所不明 + self.prefc_cd = record[18].strip() # 住所コード(県コード) + self.city_cd = record[19].strip() # 住所コード(市区町村コード) + self.addrcode1 = record[20].strip() # 住所コード(大字・通称コード) + self.addrcode2 = record[21].strip() # 住所コード(字・丁目コード) + self.zip_code = record[22].strip() # 郵便番号 + self.addr = record[23] # 住所(漢字) + self.addr_kana = record[24] # 住所(カナ) + self.addr_number = record[25] # 住所表示番号 + self.addrkanjcnt1 = record[26].strip() # 住所文字カウント:漢字(県) + self.addrkanjcnt2 = record[27].strip() # 住所文字カウント:漢字(市区町村) + self.addrkanjcnt3 = record[28].strip() # 住所文字カウント:漢字(大字・通称) + self.addrkanjcnt4 = record[29].strip() # 住所文字カウント:漢字(字・丁目) + self.addrkanacnt1 = record[30].strip() # 住所文字カウント:カナ(県) + self.addrkanacnt2 = record[31].strip() # 住所文字カウント:カナ(市区町村) + self.addrkanacnt3 = record[32].strip() # 住所文字カウント:カナ(大字・通称) + self.addrkanacnt4 = record[33].strip() # 住所文字カウント:カナ(字・丁目) + self.tel_nothing_flag = record[34].strip() # 電話番号なしフラグ + self.tel_number = record[35].strip() # 電話番号 + self.mgtclass_code = record[36].strip() # 経営体 + self.hpclass_code = record[37].strip() # 施設区分 + self.president = record[38] .strip() # 代表者(漢字) + self.president_Kana = record[39].strip() # 代表者(カナ) + self.open_flag = record[40].strip() # 開業予定(フラグ) + self.open_yearmonth = record[41].strip() # 開業予定(年月) + self.close_flg = record[42].strip() # 休院(休院フラグ) + self.close_yearmonth = record[43].strip() # 休院(開始年月) + self.pharmacist = record[44] # 管理薬剤師名(漢字) + self.pharmacist_kana = record[45] # 管理薬剤師名(カナ) + self.franchise_hq_id = record[46] # チェーン店本部コード(レコードID) + self.franchise_hq_cd = record[47] # チェーン店本部コード(施設コード) + self.franchise_hq_yobi = record[48] # チェーン店本部コード(予備) + + # 施設コード(2+3+4) + self.dcfdsf_inst_cd = ''.join([self.dcfhp_id, self.dcfhp_cd, self.dcfhp_yobi]) + + # 町字コード(18+19+20+21) + self.village_code = ''.join([self.prefc_cd, self.city_cd, self.addrcode1, self.addrcode2]) + + # 住所カウントカナ(30+31+32+33) + self.addr_count_kana = ''.join([self.addrkanacnt1, self.addrkanacnt2, self.addrkanacnt3, self.addrkanacnt4]) + + # 住所カウント(26+27+28+29) + self.addr_count = ''.join([self.addrkanjcnt1, self.addrkanjcnt2, self.addrkanjcnt3, self.addrkanjcnt4]) + + # 重複時相手先コード(10+11+12) + self.dup_opp_cd = ''.join([self.duphp_id, self.duphp_cd, self.duphp_yobi]) + + # チェーン店本部コード(46+47+48) + self.franchise_hq_cd = ''.join([self.franchise_hq_id, self.franchise_hq_cd, self.franchise_hq_yobi]) + From 7c2e10fe3b0edf3ee61dfb95460a35e8ca39f82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 17 Apr 2023 16:09:48 +0900 Subject: [PATCH 08/69] =?UTF-8?q?COM=5F=E8=96=AC=E5=B1=80=E3=80=80?= =?UTF-8?q?=E6=96=B0=E8=A6=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 312 ++++++++++++++++++ 1 file changed, 312 insertions(+) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py new file mode 100644 index 00000000..13ea6033 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -0,0 +1,312 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_pharm import ComPharm + +class ComPharmMapper(UltmarcTableMapper): + """レイアウト区分102: COM_薬局 登録処理 """ + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_pharm + WHERE + dcf_dsf_inst_cd = :dcf_dsf_inst_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_pharm + ( + dcf_dsf_inst_cd, + inst_div_cd, + addr_unknown_reason_cd, + form_inst_name_kana, + inst_name_kana, + form_inst_name_kanji, + inst_name_kanji, + close_flg, + estab_sche_flg, + close_start_ym, + estab_sche_ym, + inst_repre_kana, + inst_repre, + phone_number_non_flg, + unconf_flg, + inst_phone_number, + inst_addr_kana, + inst_addr, + postal_number, + village_cd, + prefc_cd, + city_cd, + addr_display_number, + addr_cnt_kana, + addr_cnt, + manage_cd, + delete_sche_reason_cd, + dup_opp_cd, + supervising_pharmacist, + supervising_pharmacist_kana, + franchise_hq_cd, + inst_pharm_div, + abolish_ymd, + delete_flg, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :dcfdsf_inst_cd, + :hpclass_code, + :hp_addr_lost_code, + :hp_name_kana, + :hp_ryaku_name_kana, + :hp_name, + :hp_ryaku_name, + :close_flg, + :open_flag, + :close_yearmonth, + :open_yearmonth, + :president_Kana, + :president, + :tel_nothing_flag, + :unconf_flg, + :tel_number, + :addr_kana, + :addr, + :zip_code, + :village_code, + :prefc_cd, + :city_cd, + :addr_number, + :addr_count_kana, + :addr_count, + :mgtclass_code, + :del_cd, + :dup_opp_cd, + :pharmacist, + :pharmacist_kana, + :franchise_hq_cd, + 2, + NULL, + 0, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + # 更新用SQL + UPDATE_QUERY = """\ + UPDATE src05.com_pharm + SET + {update_columns} + sys_regist_date = :execute_datetime, + regist_prgm_id = :program_name, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + dcf_dsf_inst_cd = :dcf_dsf_inst_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + # 廃業年月日 ← メンテナンス年月日 + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_pharm + SET + abolish_ymd = :maintdate, + delete_sche_reason_cd = :del_cd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + dcf_dsf_inst_cd = :dcf_dsf_inst_cd + """ + record: ComPharm + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComPharm) + program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + # モジュール名をクエリパラメータに設定 + self.query_parameter['program_name'] = program_name + # 読み込んだレコード値もクエリパラメータに追加 + self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + + def make_query(self): + # 修正区分がC(削除)の場合、論理削除 + if self.record.maint_flag == 'C': + self.queries.append(self.LOGICAL_DELETE_QUERY) + return + + # レコードの存在確認 + record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert + if record_count[0]['count_num'] == 0: + self.queries.append(self.INSERT_QUERY) + return + + # 追加、更新の場合 + update_columns = ','.join(self.__make_upsert_query(self)) + if len(update_columns) > 0: + # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる + update_columns += ',' + + update_query = self.UPDATE_QUERY.format( + update_columns=update_columns + ) + + self.queries.append(update_query) + return + + def __make_upsert_query(self): + set_clauses = [] # 設定項目 + + #### 設定項目の判定 #### + # DCFDSF施設コード(主キーなので更新対象外) + + # 施設区分コード + if self.record.hpclass_code != '': + set_clauses.append('inst_div_cd = :hpclass_code') + + # 住所不明理由コード + if self.record.hp_addr_lost_code != '': + set_clauses.append('addr_unknown_rea:hp_addr_lost_code') + self.query_parameter['hp_addr_lost_code'] = None if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code + + # 正式施設名カナ + if self.record.hp_name_kana != '': + set_clauses.append('form_inst_name_kana = :hp_name_kana') + + # 施設名カナ + if self.record.hp_ryaku_name_kana != '': + set_clauses.append('inst_name_kana = :hp_ryaku_name_kana') + + # 正式施設名(漢字) + if self.record.hp_name != '': + set_clauses.append('form_inst_name_kanji = :hp_name') + + # 施設名(漢字) + if self.record.hp_ryaku_name != '': + set_clauses.append('inst_name_kanji = :hp_ryaku_name') + + # 休院フラグ、休院予定年月 + if len(self.record.close_flg + self.record.close_yearmonth) > 0: + set_clauses.append('close_flg = :close_flg') + set_clauses.append('close_start_ym = :close_yearmonth') + if self.record.close_flg == '@': + self.query_parameter['close_flg'] = None + self.query_parameter['close_yearmonth'] = None + else: + self.record.close_flg + self.record.close_yearmonth + + # 開業予定フラグ、開業予定年月 + if len(self.record.open_flag + self.record.open_yearmonth) > 0: + set_clauses.append('estab_sche_flg = :open_flag') + set_clauses.append('estab_sche_ym = :open_yearmonth') + if self.record.open_flag == '@': + self.query_parameter['open_flag'] = None + self.query_parameter['open_yearmonth'] = None + else: + self.record.open_flag + self.record.open_yearmonth + + # 施設代表者カナ + if self.record.president_Kana != '': + set_clauses.append('inst_repre_kana = :president_Kana') + self.query_parameter['president_Kana'] = None if self.record.president_Kana == '@' else self.record.president_Kana + + # 施設代表者 ※@が大文字 + if self.record.president != '': + set_clauses.append('inst_repre = :president') + self.query_parameter['president'] = None if self.record.president == '@' else self.record.president + + # 電話番号なしフラグ + if self.record.tel_nothitel_nothing_flagng_flag_flg != '': + set_clauses.append('phone_number_non = :tel_nothing_flag') + self.query_parameter['tel_nothing_flag'] = None if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag + + # 未確認フラグ + if self.record.unconf_flg != '': + set_clauses.append('unconf_flg = :unconf_flg') + self.query_parameter['unconf_flg'] = None if self.record.unconf_flg == '@' else self.record.unconf_flg + + # 施設電話番号 + if self.record.tel_number != '': + set_clauses.append('inst_phone_number = :tel_number') + self.query_parameter['tel_number'] = None if self.record.tel_number == '@' else self.record.tel_number + + # 施設住所カナ + if self.record.addr_kana != '': + set_clauses.append('inst_addr_kana = :addr_kana') + + # 施設住所 + if self.record.addr != '': + set_clauses.append('inst_addr = :addr') + + # 郵便番号 + if self.record.zip_code != '': + set_clauses.append('postal_number = :zip_code') + + # 町字コード(住所コード) + if len(self.record.village_code) > 0: + set_clauses.append('village_cd = :village_code') # 住所コード + set_clauses.append('prefc_cd = :prefc_cd') # 都道府県コード + set_clauses.append('city_cd = :city_cd') # 市区町村コード + self.record.village_code + self.record.prefc_cd + self.record.city_cd + + # 住所表示番号 + if self.record.addr_number != '': + set_clauses.append('addr_display_number = :addr_number') + self.query_parameter['addr_number'] = None if self.record.addr_number == '@' else self.record.addr_number + + # 住所カウント(集合項目である県コードが入っていればカウントをセットする) + if len(self.record.prefc_cd) > 0: + set_clauses.append('addr_cnt = :addr_count') # 住所カウント + set_clauses.append('addr_cnt_kana = :addr_count_kana') # 住所カウントカナ + self.record.addr_count + self.record.addr_count_kana + + # 経営体コード + if self.record.mgtclass_code != '': + set_clauses.append('manage_cd = :mgtclass_code') + self.query_parameter['mgtclass_code'] = None if self.record.mgtclass_code == '@' else self.record.mgtclass_code + + # 削除予定理由コード + if self.record.del_cd != '': + set_clauses.append('delete_sche_reason_cd = :del_cd') + self.query_parameter['del_cd'] = None if self.record.del_cd == '@' else self.record.del_cd + + # 重複時相手先コード + if self.record.dup_opp_cd != '': + set_clauses.append('dup_opp_cd = :dup_opp_cd') + self.query_parameter['dup_opp_cd'] = None if self.record.dup_opp_cd == '@' else self.record.dup_opp_cd + + # 管理薬剤師名(漢字) + if self.record.pharmacist != '': + set_clauses.append('supervising_pharmacist = :pharmacist') + self.query_parameter['pharmacist'] = None if self.record.pharmacist == '@' else self.record.pharmacist + + # 管理薬剤師名(カナ) + if self.record.pharmacist_kana != '': + set_clauses.append('supervising_pharmacist_kana = :pharmacist_kana') + self.query_parameter['pharmacist_kana'] = None if self.record.pharmacist_kana == '@' else self.record.pharmacist_kana + + # チェーン店本部コード + if self.record.franchise_hq_id != '': + set_clauses.append('franchise_hq_cd = :franchise_hq_cd') + if self.record.franchise_hq_id == '@': + self.query_parameter['close_flg'] = None + self.query_parameter['close_yearmonth'] = None + self.query_parameter['franchise_hq_yobi'] = None + else: + self.record.franchise_hq_id + self.record.franchise_hq_cd + self.record.franchise_hq_yobi + + + return set_clauses \ No newline at end of file From 7f9a9e2277b025e45574194ba22157bc1bb16256 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 17 Apr 2023 16:44:08 +0900 Subject: [PATCH 09/69] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3=E3=80=81=E3=82=BF=E3=83=96=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=82=924=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 20 +- .../ultmarc/utmp_tables/tables/com_pharm.py | 202 +++++++++--------- 2 files changed, 110 insertions(+), 112 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 13ea6033..e7add5f6 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -2,6 +2,7 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.batch.ultmarc.utmp_tables.tables.com_pharm import ComPharm + class ComPharmMapper(UltmarcTableMapper): """レイアウト区分102: COM_薬局 登録処理 """ @@ -159,11 +160,11 @@ class ComPharmMapper(UltmarcTableMapper): self.queries.append(update_query) return - - def __make_upsert_query(self): - set_clauses = [] # 設定項目 - #### 設定項目の判定 #### + def __make_upsert_query(self): + set_clauses = [] # 設定項目 + + # 設定項目の判定 # DCFDSF施設コード(主キーなので更新対象外) # 施設区分コード @@ -197,7 +198,7 @@ class ComPharmMapper(UltmarcTableMapper): set_clauses.append('close_start_ym = :close_yearmonth') if self.record.close_flg == '@': self.query_parameter['close_flg'] = None - self.query_parameter['close_yearmonth'] = None + self.query_parameter['close_yearmonth'] = None else: self.record.close_flg self.record.close_yearmonth @@ -208,7 +209,7 @@ class ComPharmMapper(UltmarcTableMapper): set_clauses.append('estab_sche_ym = :open_yearmonth') if self.record.open_flag == '@': self.query_parameter['open_flag'] = None - self.query_parameter['open_yearmonth'] = None + self.query_parameter['open_yearmonth'] = None else: self.record.open_flag self.record.open_yearmonth @@ -263,7 +264,7 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.addr_number != '': set_clauses.append('addr_display_number = :addr_number') self.query_parameter['addr_number'] = None if self.record.addr_number == '@' else self.record.addr_number - + # 住所カウント(集合項目である県コードが入っていればカウントをセットする) if len(self.record.prefc_cd) > 0: set_clauses.append('addr_cnt = :addr_count') # 住所カウント @@ -302,11 +303,10 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.franchise_hq_id == '@': self.query_parameter['close_flg'] = None self.query_parameter['close_yearmonth'] = None - self.query_parameter['franchise_hq_yobi'] = None + self.query_parameter['franchise_hq_yobi'] = None else: self.record.franchise_hq_id self.record.franchise_hq_cd self.record.franchise_hq_yobi - - return set_clauses \ No newline at end of file + return set_clauses diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py index 3824ec3e..65b20c7d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py @@ -3,53 +3,53 @@ from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable class ComPharm(UltmarcTable): """レイアウト区分102: COM_薬局""" - dcfhp_id: str # DCF コード(ID) - dcfhp_code: str # DCF コード(コード) - dcfhp_yobi: str # DCF コード(予備) - maint_flag: str # 修正区分 - maintdate: str # メンテナンス年月日 - # 予備/転送年月日(未使用) - unconf_flg: str # 未確認フラグ - del_cd: str # 削除予定理由 - duphp_id: str # 重複時相手先コード(レコードID) - duphp_cd: str # 重複時相手先コード(施設コード) - duphp_yobi: str # 重複時相手先コード(予備) - hp_name: str # 正式施設名(漢字) - hp_name_kana: str # 正式施設名(カナ) - hp_ryaku_name: str # 略式施設名(漢字) - hp_ryaku_name_kana: str # 略式施設名(カナ) - hp_addr_lost_code: str # 住所不明 - prefc_cd: str # 住所コード(県コード) - city_cd: str # 住所コード(市区町村コード) - addrcode1: str # 住所コード(大字・通称コード) - addrcode2: str # 住所コード(字・丁目コード) - zip_code: str # 郵便番号 - addr: str # 住所(漢字) - addr_kana: str # 住所(カナ) - addr_number: str # 住所表示番号 - addrkanjcnt1: str # 住所文字カウント:漢字(県) - addrkanjcnt2: str # 住所文字カウント:漢字(市区町村) - addrkanjcnt3: str # 住所文字カウント:漢字(大字・通称) - addrkanjcnt4: str # 住所文字カウント:漢字(字・丁目) - addrkanacnt1: str # 住所文字カウント:カナ(県) - addrkanacnt2: str # 住所文字カウント:カナ(市区町村) - addrkanacnt3: str # 住所文字カウント:カナ(大字・通称) - addrkanacnt4: str # 住所文字カウント:カナ(字・丁目) - tel_nothing_flag: str # 電話番号なしフラグ - tel_number: str # 電話番号 - mgtclass_code: str # 経営体 - hpclass_code: str # 施設区分 - president: str # 代表者(漢字) - president_Kana: str # 代表者(カナ) - open_flag: str # 開業予定(フラグ) - open_yearmonth: str # 開業予定(年月) - close_flg: str # 休院(休院フラグ) - close_yearmonth: str # 休院(開始年月) - pharmacist: str # 管理薬剤師名(漢字) - pharmacist_kana: str # 管理薬剤師名(カナ) - franchise_hq_id: str # チェーン店本部コード(レコードID) - franchise_hq_cd: str # チェーン店本部コード(施設コード) - franchise_hq_yobi: str # チェーン店本部コード(予備) + dcfhp_id: str # DCF コード(ID) + dcfhp_code: str # DCF コード(コード) + dcfhp_yobi: str # DCF コード(予備) + maint_flag: str # 修正区分 + maintdate: str # メンテナンス年月日 + pass # 予備/転送年月日(未使用) + unconf_flg: str # 未確認フラグ + del_cd: str # 削除予定理由 + duphp_id: str # 重複時相手先コード(レコードID) + duphp_cd: str # 重複時相手先コード(施設コード) + duphp_yobi: str # 重複時相手先コード(予備) + hp_name: str # 正式施設名(漢字) + hp_name_kana: str # 正式施設名(カナ) + hp_ryaku_name: str # 略式施設名(漢字) + hp_ryaku_name_kana: str # 略式施設名(カナ) + hp_addr_lost_code: str # 住所不明 + prefc_cd: str # 住所コード(県コード) + city_cd: str # 住所コード(市区町村コード) + addrcode1: str # 住所コード(大字・通称コード) + addrcode2: str # 住所コード(字・丁目コード) + zip_code: str # 郵便番号 + addr: str # 住所(漢字) + addr_kana: str # 住所(カナ) + addr_number: str # 住所表示番号 + addrkanjcnt1: str # 住所文字カウント:漢字(県) + addrkanjcnt2: str # 住所文字カウント:漢字(市区町村) + addrkanjcnt3: str # 住所文字カウント:漢字(大字・通称) + addrkanjcnt4: str # 住所文字カウント:漢字(字・丁目) + addrkanacnt1: str # 住所文字カウント:カナ(県) + addrkanacnt2: str # 住所文字カウント:カナ(市区町村) + addrkanacnt3: str # 住所文字カウント:カナ(大字・通称) + addrkanacnt4: str # 住所文字カウント:カナ(字・丁目) + tel_nothing_flag: str # 電話番号なしフラグ + tel_number: str # 電話番号 + mgtclass_code: str # 経営体 + hpclass_code: str # 施設区分 + president: str # 代表者(漢字) + president_Kana: str # 代表者(カナ) + open_flag: str # 開業予定(フラグ) + open_yearmonth: str # 開業予定(年月) + close_flg: str # 休院(休院フラグ) + close_yearmonth: str # 休院(開始年月) + pharmacist: str # 管理薬剤師名(漢字) + pharmacist_kana: str # 管理薬剤師名(カナ) + franchise_hq_id: str # チェーン店本部コード(レコードID) + franchise_hq_cd: str # チェーン店本部コード(施設コード) + franchise_hq_yobi: str # チェーン店本部コード(予備) dcfdsf_inst_cd: str # 施設コード village_code: str # 町字コード @@ -61,69 +61,67 @@ class ComPharm(UltmarcTable): def __init__(self, record: list[str]): super().__init__(record) - self.dcfhp_id = record[2] # DCF コード(ID) - self.dcfhp_cd = record[3] # DCF コード(コード) - self.dcfhp_yobi = record[4] # DCF コード(予備) - self.maint_flag = record[5] # 修正区分 - self.maintdate = record[6] # メンテナンス年月日 - # 予備/転送年月日(未使用) - self.unconf_flg = record[8].strip() # 未確認フラグ - self.del_cd = record[9].strip() # 削除予定理由 - self.duphp_id = record[10].strip() # 重複時相手先コード(レコードID) - self.duphp_cd = record[11].strip() # 重複時相手先コード(施設コード) - self.duphp_yobi = record[12].strip() # 重複時相手先コード(予備) - self.hp_name = record[13].strip() # 正式施設名(漢字) - self.hp_name_kana = record[14].strip() # 正式施設名(カナ) - self.hp_ryaku_name = record[15].strip() # 略式施設名(漢字) - self.hp_ryaku_name_kana = record[16].strip() # 略式施設名(カナ) - self.hp_addr_lost_code = record[17].strip() # 住所不明 - self.prefc_cd = record[18].strip() # 住所コード(県コード) - self.city_cd = record[19].strip() # 住所コード(市区町村コード) - self.addrcode1 = record[20].strip() # 住所コード(大字・通称コード) - self.addrcode2 = record[21].strip() # 住所コード(字・丁目コード) - self.zip_code = record[22].strip() # 郵便番号 - self.addr = record[23] # 住所(漢字) - self.addr_kana = record[24] # 住所(カナ) - self.addr_number = record[25] # 住所表示番号 - self.addrkanjcnt1 = record[26].strip() # 住所文字カウント:漢字(県) - self.addrkanjcnt2 = record[27].strip() # 住所文字カウント:漢字(市区町村) - self.addrkanjcnt3 = record[28].strip() # 住所文字カウント:漢字(大字・通称) - self.addrkanjcnt4 = record[29].strip() # 住所文字カウント:漢字(字・丁目) - self.addrkanacnt1 = record[30].strip() # 住所文字カウント:カナ(県) - self.addrkanacnt2 = record[31].strip() # 住所文字カウント:カナ(市区町村) - self.addrkanacnt3 = record[32].strip() # 住所文字カウント:カナ(大字・通称) - self.addrkanacnt4 = record[33].strip() # 住所文字カウント:カナ(字・丁目) - self.tel_nothing_flag = record[34].strip() # 電話番号なしフラグ - self.tel_number = record[35].strip() # 電話番号 - self.mgtclass_code = record[36].strip() # 経営体 - self.hpclass_code = record[37].strip() # 施設区分 - self.president = record[38] .strip() # 代表者(漢字) - self.president_Kana = record[39].strip() # 代表者(カナ) - self.open_flag = record[40].strip() # 開業予定(フラグ) - self.open_yearmonth = record[41].strip() # 開業予定(年月) - self.close_flg = record[42].strip() # 休院(休院フラグ) - self.close_yearmonth = record[43].strip() # 休院(開始年月) - self.pharmacist = record[44] # 管理薬剤師名(漢字) - self.pharmacist_kana = record[45] # 管理薬剤師名(カナ) - self.franchise_hq_id = record[46] # チェーン店本部コード(レコードID) - self.franchise_hq_cd = record[47] # チェーン店本部コード(施設コード) - self.franchise_hq_yobi = record[48] # チェーン店本部コード(予備) + self.dcfhp_id = record[2] + self.dcfhp_cd = record[3] + self.dcfhp_yobi = record[4] + self.maint_flag = record[5] + self.maintdate = record[6] + self.unconf_flg = record[8].strip() + self.del_cd = record[9].strip() + self.duphp_id = record[10].strip() + self.duphp_cd = record[11].strip() + self.duphp_yobi = record[12].strip() + self.hp_name = record[13].strip() + self.hp_name_kana = record[14].strip() + self.hp_ryaku_name = record[15].strip() + self.hp_ryaku_name_kana = record[16].strip() + self.hp_addr_lost_code = record[17].strip() + self.prefc_cd = record[18].strip() + self.city_cd = record[19].strip() + self.addrcode1 = record[20].strip() + self.addrcode2 = record[21].strip() + self.zip_code = record[22].strip() + self.addr = record[23] + self.addr_kana = record[24] + self.addr_number = record[25] + self.addrkanjcnt1 = record[26].strip() + self.addrkanjcnt2 = record[27].strip() + self.addrkanjcnt3 = record[28].strip() + self.addrkanjcnt4 = record[29].strip() + self.addrkanacnt1 = record[30].strip() + self.addrkanacnt2 = record[31].strip() + self.addrkanacnt3 = record[32].strip() + self.addrkanacnt4 = record[33].strip() + self.tel_nothing_flag = record[34].strip() + self.tel_number = record[35].strip() + self.mgtclass_code = record[36].strip() + self.hpclass_code = record[37].strip() + self.president = record[38].strip() + self.president_Kana = record[39].strip() + self.open_flag = record[40].strip() + self.open_yearmonth = record[41].strip() + self.close_flg = record[42].strip() + self.close_yearmonth = record[43].strip() + self.pharmacist = record[44] + self.pharmacist_kana = record[45] + self.franchise_hq_id = record[46] + self.franchise_hq_cd = record[47] + self.franchise_hq_yobi = record[48] # 施設コード(2+3+4) - self.dcfdsf_inst_cd = ''.join([self.dcfhp_id, self.dcfhp_cd, self.dcfhp_yobi]) + self.dcfdsf_inst_cd = ''.join([self.dcfhp_id, self.dcfhp_cd, self.dcfhp_yobi]) # 町字コード(18+19+20+21) - self.village_code = ''.join([self.prefc_cd, self.city_cd, self.addrcode1, self.addrcode2]) + self.village_code = ''.join([self.prefc_cd, self.city_cd, self.addrcode1, self.addrcode2]) # 住所カウントカナ(30+31+32+33) - self.addr_count_kana = ''.join([self.addrkanacnt1, self.addrkanacnt2, self.addrkanacnt3, self.addrkanacnt4]) + self.addr_count_kana = ''.join([self.addrkanacnt1, self.addrkanacnt2, self.addrkanacnt3, self.addrkanacnt4]) # 住所カウント(26+27+28+29) - self.addr_count = ''.join([self.addrkanjcnt1, self.addrkanjcnt2, self.addrkanjcnt3, self.addrkanjcnt4]) - + self.addr_count = ''.join([self.addrkanjcnt1, self.addrkanjcnt2, self.addrkanjcnt3, self.addrkanjcnt4]) + # 重複時相手先コード(10+11+12) - self.dup_opp_cd = ''.join([self.duphp_id, self.duphp_cd, self.duphp_yobi]) + self.dup_opp_cd = ''.join([self.duphp_id, self.duphp_cd, self.duphp_yobi]) # チェーン店本部コード(46+47+48) - self.franchise_hq_cd = ''.join([self.franchise_hq_id, self.franchise_hq_cd, self.franchise_hq_yobi]) - + self.franchise_hq_cd = ''.join([self.franchise_hq_id, self.franchise_hq_cd, self.franchise_hq_yobi]) From f32953c0bfb1e9bc7b445cfb9f7fee07a6ecb969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 17 Apr 2023 17:33:49 +0900 Subject: [PATCH 10/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7f99ffd0..e9ded3b7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "version": "0.2.0", "configurations": [ { - "name": "Batch Sample", + "name": "Python: データ取り込みローカル実行", "type": "python", "request": "launch", "program": "entrypoint.py", From b45d1bcdea2b26f535dcccfdd8f450944f57c3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 17 Apr 2023 17:34:44 +0900 Subject: [PATCH 11/69] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/.env | 10 ++++++++++ .../table_mapper/concrete/com_pharm_mapper.py | 18 +++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 ecs/jskult-batch-daily/.env diff --git a/ecs/jskult-batch-daily/.env b/ecs/jskult-batch-daily/.env new file mode 100644 index 00000000..214b488c --- /dev/null +++ b/ecs/jskult-batch-daily/.env @@ -0,0 +1,10 @@ +DB_HOST=localhost +DB_PORT=3306 +DB_USERNAME=root +DB_PASSWORD=admin +DB_SCHEMA=src05 +LOG_LEVEL=INFO +ULTMARC_DATA_BUCKET=**************** +ULTMARC_DATA_FOLDER=recv +ULTMARC_BACKUP_BUCKET=**************** +ULTMARC_BACKUP_FOLDER=ultmarc diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index e7add5f6..60aa4295 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -104,8 +104,6 @@ class ComPharmMapper(UltmarcTableMapper): UPDATE src05.com_pharm SET {update_columns} - sys_regist_date = :execute_datetime, - regist_prgm_id = :program_name, sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE @@ -148,8 +146,8 @@ class ComPharmMapper(UltmarcTableMapper): self.queries.append(self.INSERT_QUERY) return - # 追加、更新の場合 - update_columns = ','.join(self.__make_upsert_query(self)) + # 更新の場合 + update_columns = ','.join(self.__make_update_query(self)) if len(update_columns) > 0: # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる update_columns += ',' @@ -161,7 +159,7 @@ class ComPharmMapper(UltmarcTableMapper): self.queries.append(update_query) return - def __make_upsert_query(self): + def __make_update_query(self): set_clauses = [] # 設定項目 # 設定項目の判定 @@ -199,9 +197,6 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.close_flg == '@': self.query_parameter['close_flg'] = None self.query_parameter['close_yearmonth'] = None - else: - self.record.close_flg - self.record.close_yearmonth # 開業予定フラグ、開業予定年月 if len(self.record.open_flag + self.record.open_yearmonth) > 0: @@ -210,9 +205,6 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.open_flag == '@': self.query_parameter['open_flag'] = None self.query_parameter['open_yearmonth'] = None - else: - self.record.open_flag - self.record.open_yearmonth # 施設代表者カナ if self.record.president_Kana != '': @@ -304,9 +296,5 @@ class ComPharmMapper(UltmarcTableMapper): self.query_parameter['close_flg'] = None self.query_parameter['close_yearmonth'] = None self.query_parameter['franchise_hq_yobi'] = None - else: - self.record.franchise_hq_id - self.record.franchise_hq_cd - self.record.franchise_hq_yobi return set_clauses From 7cb4535634e05e93d0124de57c89b444a395b47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Mon, 17 Apr 2023 17:56:30 +0900 Subject: [PATCH 12/69] =?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(), + '【洗替】3:HCO施設コードの洗替① 開始'); + TRUNCATE TABLE internal05.v_inst_merge_t; + call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(), + '【洗替】3:HCO施設コードの洗替① 終了'); + + call medaca_common.put_info_log('internal05', 'src05.v_inst_merge_t_create', JSON_OBJECT(), + '【洗替】3: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(), + '【洗替】3:HCO施設コードの洗替② 終了' ); END From f3e8c5a0670befc11788aedce770be866a86a6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 18 Apr 2023 10:47:44 +0900 Subject: [PATCH 13/69] =?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?= Date: Tue, 18 Apr 2023 14:48:21 +0900 Subject: [PATCH 14/69] =?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, - '【洗替】3:HCO施設コードの洗替① 開始'); + 'V施設統合マスタ(洗替処理一時テーブル)作成① 開始'); TRUNCATE TABLE internal05.v_inst_merge_t; call medaca_common.put_info_log(schema_name, procedure_name, procedure_args, - '【洗替】3:HCO施設コードの洗替① 終了'); + 'V施設統合マスタ(洗替処理一時テーブル)作成① 終了'); call medaca_common.put_info_log(schema_name, procedure_name, procedure_args, - '【洗替】3: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, - '【洗替】3:HCO施設コードの洗替② 終了' ); + 'V施設統合マスタ(洗替処理一時テーブル)作成② 終了' ); END From d5ddb1f6672a1fb8aa81d001e1ee7cf0a1beeeea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 18 Apr 2023 17:58:35 +0900 Subject: [PATCH 15/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=83=87?= =?UTF-8?q?=E3=83=A2=E5=8D=98=E4=BD=93=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 60aa4295..8a91d87d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -13,7 +13,7 @@ class ComPharmMapper(UltmarcTableMapper): FROM src05.com_pharm WHERE - dcf_dsf_inst_cd = :dcf_dsf_inst_cd + dcf_dsf_inst_cd = :dcfdsf_inst_cd """ # データ登録用SQL INSERT_QUERY = """\ @@ -107,7 +107,7 @@ class ComPharmMapper(UltmarcTableMapper): sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE - dcf_dsf_inst_cd = :dcf_dsf_inst_cd + dcf_dsf_inst_cd = :dcfdsf_inst_cd """ # 修正区分が「C(削除)」の場合の更新SQL @@ -121,7 +121,7 @@ class ComPharmMapper(UltmarcTableMapper): sys_update_date = :execute_date_str_ymd, update_prgm_id = :program_name WHERE - dcf_dsf_inst_cd = :dcf_dsf_inst_cd + dcf_dsf_inst_cd = :dcfdsf_inst_cd """ record: ComPharm @@ -147,9 +147,10 @@ class ComPharmMapper(UltmarcTableMapper): return # 更新の場合 - update_columns = ','.join(self.__make_update_query(self)) + update_columns = ','.join(self.__make_update_query()) + + # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる if len(update_columns) > 0: - # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる update_columns += ',' update_query = self.UPDATE_QUERY.format( @@ -171,7 +172,7 @@ class ComPharmMapper(UltmarcTableMapper): # 住所不明理由コード if self.record.hp_addr_lost_code != '': - set_clauses.append('addr_unknown_rea:hp_addr_lost_code') + set_clauses.append('addr_unknown_reason_cd = :hp_addr_lost_code') self.query_parameter['hp_addr_lost_code'] = None if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code # 正式施設名カナ @@ -217,8 +218,8 @@ class ComPharmMapper(UltmarcTableMapper): self.query_parameter['president'] = None if self.record.president == '@' else self.record.president # 電話番号なしフラグ - if self.record.tel_nothitel_nothing_flagng_flag_flg != '': - set_clauses.append('phone_number_non = :tel_nothing_flag') + if self.record.tel_nothing_flag != '': + set_clauses.append('phone_number_non_flg = :tel_nothing_flag') self.query_parameter['tel_nothing_flag'] = None if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag # 未確認フラグ From ed19d5dd5dd5dea08832eaa40fa0cecd4f671388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 18 Apr 2023 17:58:56 +0900 Subject: [PATCH 16/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=83=87?= =?UTF-8?q?=E3=83=A2=E5=8D=98=E4=BD=93=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ultmarc/utmp_tables/tables/com_pharm.py | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py index 65b20c7d..bca8175a 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py @@ -61,52 +61,52 @@ class ComPharm(UltmarcTable): def __init__(self, record: list[str]): super().__init__(record) - self.dcfhp_id = record[2] - self.dcfhp_cd = record[3] - self.dcfhp_yobi = record[4] - self.maint_flag = record[5] - self.maintdate = record[6] - self.unconf_flg = record[8].strip() - self.del_cd = record[9].strip() - self.duphp_id = record[10].strip() - self.duphp_cd = record[11].strip() - self.duphp_yobi = record[12].strip() - self.hp_name = record[13].strip() - self.hp_name_kana = record[14].strip() - self.hp_ryaku_name = record[15].strip() - self.hp_ryaku_name_kana = record[16].strip() - self.hp_addr_lost_code = record[17].strip() - self.prefc_cd = record[18].strip() - self.city_cd = record[19].strip() - self.addrcode1 = record[20].strip() - self.addrcode2 = record[21].strip() - self.zip_code = record[22].strip() - self.addr = record[23] - self.addr_kana = record[24] - self.addr_number = record[25] - self.addrkanjcnt1 = record[26].strip() - self.addrkanjcnt2 = record[27].strip() - self.addrkanjcnt3 = record[28].strip() - self.addrkanjcnt4 = record[29].strip() - self.addrkanacnt1 = record[30].strip() - self.addrkanacnt2 = record[31].strip() - self.addrkanacnt3 = record[32].strip() - self.addrkanacnt4 = record[33].strip() - self.tel_nothing_flag = record[34].strip() - self.tel_number = record[35].strip() - self.mgtclass_code = record[36].strip() - self.hpclass_code = record[37].strip() - self.president = record[38].strip() - self.president_Kana = record[39].strip() - self.open_flag = record[40].strip() - self.open_yearmonth = record[41].strip() - self.close_flg = record[42].strip() - self.close_yearmonth = record[43].strip() - self.pharmacist = record[44] - self.pharmacist_kana = record[45] - self.franchise_hq_id = record[46] - self.franchise_hq_cd = record[47] - self.franchise_hq_yobi = record[48] + self.dcfhp_id = record[1] + self.dcfhp_cd = record[2] + self.dcfhp_yobi = record[3] + self.maint_flag = record[4] + self.maintdate = record[5] + self.unconf_flg = record[7].strip() + self.del_cd = record[8].strip() + self.duphp_id = record[9].strip() + self.duphp_cd = record[10].strip() + self.duphp_yobi = record[11].strip() + self.hp_name = record[12].strip() + self.hp_name_kana = record[13].strip() + self.hp_ryaku_name = record[14].strip() + self.hp_ryaku_name_kana = record[15].strip() + self.hp_addr_lost_code = record[16].strip() + self.prefc_cd = record[17].strip() + self.city_cd = record[18].strip() + self.addrcode1 = record[19].strip() + self.addrcode2 = record[20].strip() + self.zip_code = record[21].strip() + self.addr = record[22] + self.addr_kana = record[23] + self.addr_number = record[24] + self.addrkanjcnt1 = record[25].strip() + self.addrkanjcnt2 = record[26].strip() + self.addrkanjcnt3 = record[27].strip() + self.addrkanjcnt4 = record[28].strip() + self.addrkanacnt1 = record[29].strip() + self.addrkanacnt2 = record[30].strip() + self.addrkanacnt3 = record[31].strip() + self.addrkanacnt4 = record[32].strip() + self.tel_nothing_flag = record[33].strip() + self.tel_number = record[34].strip() + self.mgtclass_code = record[35].strip() + self.hpclass_code = record[36].strip() + self.president = record[37].strip() + self.president_Kana = record[38].strip() + self.open_flag = record[39].strip() + self.open_yearmonth = record[40].strip() + self.close_flg = record[41].strip() + self.close_yearmonth = record[42].strip() + self.pharmacist = record[43] + self.pharmacist_kana = record[44] + self.franchise_hq_id = record[45] + self.franchise_hq_cd = record[46] + self.franchise_hq_yobi = record[47] # 施設コード(2+3+4) self.dcfdsf_inst_cd = ''.join([self.dcfhp_id, self.dcfhp_cd, self.dcfhp_yobi]) From 3c814d547705640e91a1a876fad3ee7fb93efc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 18 Apr 2023 17:59:36 +0900 Subject: [PATCH 17/69] =?UTF-8?q?win=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/tests/testing_utility.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/testing_utility.py b/ecs/jskult-batch-daily/tests/testing_utility.py index e95da8e7..5a6c3a42 100644 --- a/ecs/jskult-batch-daily/tests/testing_utility.py +++ b/ecs/jskult-batch-daily/tests/testing_utility.py @@ -1,5 +1,5 @@ -"""テスト用共通処理関数""" import csv +import os import tempfile from datetime import datetime @@ -22,12 +22,13 @@ def create_ultmarc_test_data_from_csv(file_path: str) -> DatFile: """ # 一度、Shift-JISファイルで書き出す - with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932') as tmp_file: + with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932', delete=False) as tmp_file: tmp_file.write(csv_file.read()) tmp_file.seek(0) tmpfile_path = tmp_file.name - dat_file = DatFile.from_path(tmpfile_path) + dat_file = DatFile.from_path(tmpfile_path) + os.unlink(tmpfile_path) return dat_file From c24379280f072e9ff5cfa439666378d814454220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 18 Apr 2023 18:00:48 +0900 Subject: [PATCH 18/69] =?UTF-8?q?COM=5F=E8=96=AC=E5=B1=80=E3=80=80?= =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9=E3=83=88=E3=80=80=E6=96=B0?= =?UTF-8?q?=E8=A6=8F=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/com_pharm/__init__.py | 0 .../com_pharm/com_pharm_delete.csv | 1 + .../com_pharm/com_pharm_insert.csv | 1 + .../com_pharm/expect_com_pharm_insert.csv | 2 + .../com_pharm/expect_com_pharm_update.csv | 3 + .../com_pharm/test_com_pharm_mapper.py | 197 ++++++++++++++++++ 6 files changed, 204 insertions(+) create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv new file mode 100644 index 00000000..e6a84d8c --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv @@ -0,0 +1 @@ +"102","9","9","9","C","200501","200601","7","0","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv new file mode 100644 index 00000000..24dfad89 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv @@ -0,0 +1 @@ +"102","1","2","3","A","200501","200601","7","8","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv new file mode 100644 index 00000000..f692eb44 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv @@ -0,0 +1,2 @@ +"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv new file mode 100644 index 00000000..9eb9020e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv @@ -0,0 +1,3 @@ +"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","6","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" +"456","66","0","正カナ","略カナ","正漢字","略漢字","8","4","204812","204411","代カナ","代漢","0","6","119991234","住所カナ","住所漢字","001-6234","61626364","61","62","11","ケシトチ","県市通丁目","11","7","555657","薬剤師漢字","薬剤師カナ","998877","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/18 10:27:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py new file mode 100644 index 00000000..8d190859 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py @@ -0,0 +1,197 @@ +import os.path as path +from datetime import datetime + +import pytest + +from src.batch.common.batch_config import BatchConfig +from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_pharm_mapper +from src.db.database import Database +from tests.testing_utility import (assert_table_results, + create_db_data_from_csv, + create_delete_sql_with_parameter, + create_insert_sql_with_parameter, + create_ultmarc_table_mapper_sut, + create_ultmarc_test_data_from_csv) + + +class TestComPharmMapper: + """ レイアウト区分102: COM_薬局 """ + + db: Database + batch_config: BatchConfig + test_file_path: str = path.dirname(__file__) + + @pytest.fixture(autouse=True, scope='function') + def pre_test(self, database: Database): + """ テスト実行前後処理 """ + self.batch_config = BatchConfig.get_instance() + # setup + self.db = database + self.db.connect() + self.db.begin() + + # testing + yield + + # teardown + self.db.rollback() + self.db.disconnect() + + def test_insert_record(self): + """ + Cases: + COM_薬局テーブルにレコードを登録する + Arranges: + - CSVデータを用意し、読み込む + - 追加対象となるレコードを削除する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_pharm', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_pharm_mapper.ComPharmMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_pharm_mapper.ComPharmMapper, f'{line_number}行目:マッパークラスが期通りか' + + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_pharm_insert.csv')) + primary_keys = [f"'{primary_key['dcf_dsf_inst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_pharm WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_update_record(self): + """ + Cases: + COM_薬局テーブルのレコードを更新する + Arranges: + - CSVデータを用意し、読み込む + - 更新対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_pharm', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_pharm_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_pharm', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_pharm_mapper.ComPharmMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_pharm_mapper.ComPharmMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_pharm_update.csv')) + primary_keys = [f"'{primary_key['dcf_dsf_inst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_pharm WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_logical_delete(self): + """ + Cases: + COM_薬局テーブルのレコードを1件論理削除する + Arranges: + - CSVデータを用意し、読み込む + - 削除対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_pharm', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_pharm_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_pharm', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_pharm_mapper.ComPharmMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_pharm_mapper.ComPharmMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_pharm_delete.csv')) + primary_keys = [f"'{primary_key['dcf_dsf_inst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_pharm WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' From 81e1fc8abb5e5df82e2867d6bbea3db56d38c438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 19 Apr 2023 10:25:25 +0900 Subject: [PATCH 19/69] =?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 fff319f98b1a8268f1503738fd1a7802e2ae0d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 14:43:38 +0900 Subject: [PATCH 20/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/concrete/com_pharm_mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 8a91d87d..50241a36 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -294,8 +294,8 @@ class ComPharmMapper(UltmarcTableMapper): if self.record.franchise_hq_id != '': set_clauses.append('franchise_hq_cd = :franchise_hq_cd') if self.record.franchise_hq_id == '@': - self.query_parameter['close_flg'] = None - self.query_parameter['close_yearmonth'] = None + self.query_parameter['franchise_hq_id'] = None + self.query_parameter['franchise_hq_cd'] = None self.query_parameter['franchise_hq_yobi'] = None return set_clauses From 38a3338f173f962bc90632d231cfd00b8b56f212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 14:44:20 +0900 Subject: [PATCH 21/69] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E7=94=A8=E3=83=87=E3=83=BC=E3=82=BF=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_pharm/com_pharm_insert.csv | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv index 24dfad89..1eb9a6de 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv @@ -1 +1,46 @@ -"102","1","2","3","A","200501","200601","7","8","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" \ No newline at end of file +"102","12","345678","3","A","200501","200601","7","8","123","456","78901","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオ","6","17","189","19","2099","221-0001","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","1.23457E+12","25","26","27","28","29","30","31","32","3","0120-1234-12345","353","22","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","9","204001","1","204201","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","12","3456","78901" +"102","3","3673000",,"A","20121127","20121128",,,,,,"正式店舗名03","セイシキテンポメイ03","略式03","リヤクシキ03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","2-45-1-03","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673001",,"A","20121128","20121129",,,,,,"正式店舗名03A01a","セイシキテンポメイ03A01A","略式03A01a","リヤクシキ03A01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","2-45-1-03A01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673002",,"A","20121127","20121128",,,,,,"正式店舗名03A01b-01","セイシキテンポメイ03A01B-01","略式03A01b-01","リヤクシキ03A01B-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673003",,"A","20121128","20121129",,,,,,"正式店舗名03A01b-02","セイシキテンポメイ03A01B-02","略式03A01b-02","リヤクシキ03A01B-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673004",,"A","20121128","20121129",,,,,,"正式店舗名03A01c","セイシキテンポメイ03A01C","略式03A01c","リヤクシキ03A01C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","2-45-1-03A01C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, +"102","3","3673005",,"A","20121128","20121129","1",,,,,"正式店舗名03A01d","セイシキテンポメイ03A01D","略式03A01d","リヤクシキ03A01D",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","2-45-1-03A01D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673010",,"A","20121127","20121128",,"1",,,,"正式店舗名03A02a","セイシキテンポメイ03A02A","略式03A02a","リヤクシキ03A02A","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","2-45-1-03A02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673011",,"A","20121127","20121128","1",,,,,"正式店舗名03B01a","セイシキテンポメイ03B01A","略式03B01a","リヤクシキ03B01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","2-45-1-03B01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673012",,"A","20121127","20121128",,,,,,"正式店舗名03B02a","セイシキテンポメイ03B02A","略式03B02a","リヤクシキ03B02A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","2-45-1-03B02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673013",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02b","セイシキテンポメイ03B02B","略式03B02b","リヤクシキ03B02B","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","2-45-1-03B02B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673014",,"A","20121127","20121128",,,,,,"正式店舗名03B02c-01","セイシキテンポメイ03B02C-01","略式03B02c-01","リヤクシキ03B02C-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673015",,"A","20121128","20121129",,,,,,"正式店舗名03B02c-02","セイシキテンポメイ03B02C-02","略式03B02c-02","リヤクシキ03B02C-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673016",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-01","セイシキテンポメイ03B02D-01","略式03B02d-01","リヤクシキ03B02D-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673020",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-02","セイシキテンポメイ03B02D-02","略式03B02d-02","リヤクシキ03B02D-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673021",,"A","20121128","20121129",,,,,,"正式店舗名03B02d-03","セイシキテンポメイ03B02D-03","略式03B02d-03","リヤクシキ03B02D-03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673022",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02e","セイシキテンポメイ03B02E","略式03B02e","リヤクシキ03B02E","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02e","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","2-45-1-03B02E","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673023",,"A","20121127","20121128",,,,,,"正式店舗名03B03a全件","セイシキテンポメイ03B03Aゼンケン","略式03B03a全件","リヤクシキ03B03Aゼンケン",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","2-45-1-03B03A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673024",,"A","20121127","20121128",,,,,,"正式店舗名03B03b","セイシキテンポメイ03B03B","略式03B03b","リヤクシキ03B03B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","2-45-1-03B03B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673025",,"A","20121127","20121128",,,,,,"正式店舗名03B04a","セイシキテンポメイ03B04A","略式03B04a","リヤクシキ03B04A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","2-45-1-03B04A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673026",,"A","20121127","20121128",,,,,,"正式店舗名03B04b","セイシキテンポメイ03B04B","略式03B04b","リヤクシキ03B04B","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","2-45-1-03B04B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673030",,"A","20121127","20121128",,,,,,"正式店舗名03B04c","セイシキテンポメイ03B04C","略式03B04c","リヤクシキ03B04C","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","2-45-1-03B04C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673031",,"A","20121127","20121128",,,,,,"正式店舗名03B05a","セイシキテンポメイ03B05A","略式03B05a","リヤクシキ03B05A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","2-45-1-03B05A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673032",,"A","20121127","20121128",,,,,,"正式店舗名03B05b","セイシキテンポメイ03B05B","略式03B05b","リヤクシキ03B05B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","2-45-1-03B05B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673033",,"A","20121127","20121128",,,,,,"正式店舗名03B06a","セイシキテンポメイ03B06A","略式03B06a","リヤクシキ03B06A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","2-45-1-03B06A","3","3","5","2","7","7","12","2","1",,"471","85",,,,,,,,,,, +"102","3","3673034",,"A","20121127","20121128",,,,,,"正式店舗名03B06b","セイシキテンポメイ03B06B","略式03B06b","リヤクシキ03B06B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","2-45-1-03B06B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673035",,"A","20121127","20121128",,,,,,"正式店舗名03B06c","セイシキテンポメイ03B06C","略式03B06c","リヤクシキ03B06C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","2-45-1-03B06C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673036",,"A","20121127","20121128",,,,,,"正式店舗名03B07a","セイシキテンポメイ03B07A","略式03B07a","リヤクシキ03B07A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B07a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","2-45-1-03B07A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673040",,"A","20121127","20121128",,,,,,"正式店舗名03B08a","セイシキテンポメイ03B08A","略式03B08a","リヤクシキ03B08A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B08a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","2-45-1-03B08A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673041",,"A","20121127","20121128",,,,,,"正式店舗名03B09a","セイシキテンポメイ03B09A","略式03B09a","リヤクシキ03B09A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","2-45-1-03B09A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673042",,"A","20121127","20121128",,,,,,"正式店舗名03B09b","セイシキテンポメイ03B09B","略式03B09b","リヤクシキ03B09B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","2-45-1-03B09B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09b","ダイヒヨウシヤメイ 03B09B",,,,,,,,, +"102","3","3673043",,"A","20121127","20121128",,,,,,"正式店舗名03B09c","セイシキテンポメイ03B09C","略式03B09c","リヤクシキ03B09C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","2-45-1-03B09C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09c","ダイヒヨウシヤメイ 03B09C",,,,,,,,, +"102","3","3673044",,"A","20121127","20121128",,,,,,"正式店舗名03B10a","セイシキテンポメイ03B10A","略式03B10a","リヤクシキ03B10A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","2-45-1-03B10A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, +"102","3","3673045",,"A","20121127","20121128",,,,,,"正式店舗名03B10b","セイシキテンポメイ03B10B","略式03B10b","リヤクシキ03B10B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","2-45-1-03B10B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201210",,,,,,, +"102","3","3673046",,"A","20121127","20121128",,,,,,"正式店舗名03B11a","セイシキテンポメイ03B11A","略式03B11a","リヤクシキ03B11A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","2-45-1-03B11A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673047",,"A","20121127","20121128",,,,,,"正式店舗名03B11b","セイシキテンポメイ03B11B","略式03B11b","リヤクシキ03B11B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","2-45-1-03B11B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, +"102","3","3673048",,"A","20121127","20121128",,,,,,"正式店舗名03B11c","セイシキテンポメイ03B11C","略式03B11c","リヤクシキ03B11C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","2-45-1-03B11C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, +"102","3","3673051",,"A","20121127","20121128",,,,,,"正式店舗名03B12a","セイシキテンポメイ03B12A","略式03B12a","リヤクシキ03B12A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","2-45-1-03B12A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673052",,"A","20121127","20121128",,,,,,"正式店舗名03B12b","セイシキテンポメイ03B12B","略式03B12b","リヤクシキ03B12B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","2-45-1-03B12B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B",,, +"102","3","3673053",,"A","20121127","20121128",,,,,,"正式店舗名03B12c","セイシキテンポメイ03B12C","略式03B12c","リヤクシキ03B12C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","2-45-1-03B12C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C",,, +"102","3","3673054",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","3","3673055",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","3","3673056",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","3","3673060",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","3","3673061",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,"3","3673056", +"102","3","3673062",,"A","20121127","20121128",,,,,,"正式店舗名03B13c","セイシキテンポメイ03B13C","略式03B13c","リヤクシキ03B13C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","2-45-1-03B13C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, From c9b22d901e5d88fe262fe2587ed90b6c349e2f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 14:44:41 +0900 Subject: [PATCH 22/69] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E7=94=A8=E3=83=87=E3=83=BC=E3=82=BF=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_pharm/expect_com_pharm_insert.csv | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv index f692eb44..7c0b01c6 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv @@ -1,2 +1,47 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" \ No newline at end of file +"123456783","22","6","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","アイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","亜居宇絵尾亜居宇絵尾亜居宇絵尾","1","9","204201","204001","アイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","3","7","0120-1234-12345","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","221-0001","17189192099","17","189","1.23457E+12","29303132","25262728","353","8","12345678901","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","12345678901","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673000","85","","セイシキテンポメイ03","リヤクシキ03","正式店舗名03","略式03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","東京都中央区日本橋浜町2-45-1 03","103-0007","13102242","13","102","2-45-1-03","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673001","85","","セイシキテンポメイ03A01A","リヤクシキ03A01A","正式店舗名03A01a","略式03A01a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","東京都中央区日本橋浜町2-45-1 03A01a","103-0007","13102242","13","102","2-45-1-03A01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673002","85","","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673003","85","","セイシキテンポメイ03A01B-02","リヤクシキ03A01B-02","正式店舗名03A01b-02","略式03A01b-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673004","85","","セイシキテンポメイ03A01C","リヤクシキ03A01C","正式店舗名03A01c","略式03A01c","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","東京都中央区日本橋浜町2-45-1 03A01c","103-0007","13102242","13","102","2-45-1-03A01C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673005","85","","セイシキテンポメイ03A01D","リヤクシキ03A01D","正式店舗名03A01d","略式03A01d","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","東京都中央区日本橋浜町2-45-1 03A01d","103-0007","13102242","13","102","2-45-1-03A01D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673011","85","","セイシキテンポメイ03B01A","リヤクシキ03B01A","正式店舗名03B01a","略式03B01a","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","東京都中央区日本橋浜町2-45-1 03B01a","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673012","85","","セイシキテンポメイ03B02A","リヤクシキ03B02A","正式店舗名03B02a","略式03B02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","東京都中央区日本橋浜町2-45-1 03B02a","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673013","85","6","セイシキテンポメイ03B02B","リヤクシキ03B02B","正式店舗名03B02b","略式03B02b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","東京都中央区日本橋浜町2-45-1 03B02b","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673014","85","","セイシキテンポメイ03B02C-01","リヤクシキ03B02C-01","正式店舗名03B02c-01","略式03B02c-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673015","85","","セイシキテンポメイ03B02C-02","リヤクシキ03B02C-02","正式店舗名03B02c-02","略式03B02c-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673016","85","","セイシキテンポメイ03B02D-01","リヤクシキ03B02D-01","正式店舗名03B02d-01","略式03B02d-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673020","85","","セイシキテンポメイ03B02D-02","リヤクシキ03B02D-02","正式店舗名03B02d-02","略式03B02d-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673021","85","","セイシキテンポメイ03B02D-03","リヤクシキ03B02D-03","正式店舗名03B02d-03","略式03B02d-03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673022","85","6","セイシキテンポメイ03B02E","リヤクシキ03B02E","正式店舗名03B02e","略式03B02e","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","東京都中央区日本橋浜町2-45-1 03B02e","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673023","85","","セイシキテンポメイ03B03Aゼンケン","リヤクシキ03B03Aゼンケン","正式店舗名03B03a全件","略式03B03a全件","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","東京都中央区日本橋浜町2-45-1 03B03a","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673024","85","","セイシキテンポメイ03B03B","リヤクシキ03B03B","正式店舗名03B03b","略式03B03b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","東京都中央区日本橋浜町2-45-1 03B03b","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673025","85","","セイシキテンポメイ03B04A","リヤクシキ03B04A","正式店舗名03B04a","略式03B04a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","東京都中央区日本橋浜町2-45-1 03B04a","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673026","85","1","セイシキテンポメイ03B04B","リヤクシキ03B04B","正式店舗名03B04b","略式03B04b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","東京都中央区日本橋浜町2-45-1 03B04b","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673030","85","1","セイシキテンポメイ03B04C","リヤクシキ03B04C","正式店舗名03B04c","略式03B04c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","東京都中央区日本橋浜町2-45-1 03B04c","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673031","85","","セイシキテンポメイ03B05A","リヤクシキ03B05A","正式店舗名03B05a","略式03B05a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","東京都中央区日本橋浜町2-45-1 03B05a","103-0007","13102242","13","102","2-45-1-03B05A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673032","85","","セイシキテンポメイ03B05B","リヤクシキ03B05B","正式店舗名03B05b","略式03B05b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","東京都中央区日本橋浜町2-45-1 03B05b","103-0007","13102242","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673033","85","","セイシキテンポメイ03B06A","リヤクシキ03B06A","正式店舗名03B06a","略式03B06a","","","","","","","1","","","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","東京都中央区日本橋浜町2-45-1 03B06a","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673034","85","","セイシキテンポメイ03B06B","リヤクシキ03B06B","正式店舗名03B06b","略式03B06b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","東京都中央区日本橋浜町2-45-1 03B06b","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673035","85","","セイシキテンポメイ03B06C","リヤクシキ03B06C","正式店舗名03B06c","略式03B06c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","東京都中央区日本橋浜町2-45-1 03B06c","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673036","85","","セイシキテンポメイ03B07A","リヤクシキ03B07A","正式店舗名03B07a","略式03B07a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","東京都中央区日本橋浜町2-45-1 03B07a","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673040","85","","セイシキテンポメイ03B08A","リヤクシキ03B08A","正式店舗名03B08a","略式03B08a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","東京都中央区日本橋浜町2-45-1 03B08a","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673041","85","","セイシキテンポメイ03B09A","リヤクシキ03B09A","正式店舗名03B09a","略式03B09a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","東京都中央区日本橋浜町2-45-1 03B09a","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673042","85","","セイシキテンポメイ03B09B","リヤクシキ03B09B","正式店舗名03B09b","略式03B09b","","","","","ダイヒヨウシヤメイ 03B09B","代表者名 03B09b","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","東京都中央区日本橋浜町2-45-1 03B09b","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673043","85","","セイシキテンポメイ03B09C","リヤクシキ03B09C","正式店舗名03B09c","略式03B09c","","","","","ダイヒヨウシヤメイ 03B09C","代表者名 03B09c","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","東京都中央区日本橋浜町2-45-1 03B09c","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673044","85","","セイシキテンポメイ03B10A","リヤクシキ03B10A","正式店舗名03B10a","略式03B10a","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","東京都中央区日本橋浜町2-45-1 03B10a","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673045","85","","セイシキテンポメイ03B10B","リヤクシキ03B10B","正式店舗名03B10b","略式03B10b","","1","","201210","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","東京都中央区日本橋浜町2-45-1 03B10b","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673046","85","","セイシキテンポメイ03B11A","リヤクシキ03B11A","正式店舗名03B11a","略式03B11a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","東京都中央区日本橋浜町2-45-1 03B11a","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673047","85","","セイシキテンポメイ03B11B","リヤクシキ03B11B","正式店舗名03B11b","略式03B11b","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","東京都中央区日本橋浜町2-45-1 03B11b","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673048","85","","セイシキテンポメイ03B11C","リヤクシキ03B11C","正式店舗名03B11c","略式03B11c","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","東京都中央区日本橋浜町2-45-1 03B11c","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673051","85","","セイシキテンポメイ03B12A","リヤクシキ03B12A","正式店舗名03B12a","略式03B12a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","東京都中央区日本橋浜町2-45-1 03B12a","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673052","85","","セイシキテンポメイ03B12B","リヤクシキ03B12B","正式店舗名03B12b","略式03B12b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","東京都中央区日本橋浜町2-45-1 03B12b","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673053","85","","セイシキテンポメイ03B12C","リヤクシキ03B12C","正式店舗名03B12c","略式03B12c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","東京都中央区日本橋浜町2-45-1 03B12c","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673054","89","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673055","85","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673056","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673060","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673061","85","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","33673056","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"33673062","89","","セイシキテンポメイ03B13C","リヤクシキ03B13C","正式店舗名03B13c","略式03B13c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","東京都中央区日本橋浜町2-45-1 03B13c","103-0007","13102242","13","102","2-45-1-03B13C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" From da3b4251c35addbd6830dd7e2845e585a86e055a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 14:45:05 +0900 Subject: [PATCH 23/69] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/com_pharm/test_com_pharm_mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py index 8d190859..6b9bc7cf 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py @@ -28,13 +28,13 @@ class TestComPharmMapper: # setup self.db = database self.db.connect() - self.db.begin() + # self.db.begin() # testing yield # teardown - self.db.rollback() + # self.db.rollback() self.db.disconnect() def test_insert_record(self): From fc64409badfd301642ba71573e14fc521fc75071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 18:18:17 +0900 Subject: [PATCH 24/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 50241a36..fbe7542f 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -117,7 +117,6 @@ class ComPharmMapper(UltmarcTableMapper): src05.com_pharm SET abolish_ymd = :maintdate, - delete_sche_reason_cd = :del_cd, sys_update_date = :execute_date_str_ymd, update_prgm_id = :program_name WHERE @@ -173,7 +172,7 @@ class ComPharmMapper(UltmarcTableMapper): # 住所不明理由コード if self.record.hp_addr_lost_code != '': set_clauses.append('addr_unknown_reason_cd = :hp_addr_lost_code') - self.query_parameter['hp_addr_lost_code'] = None if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code + self.query_parameter['hp_addr_lost_code'] = '' if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code # 正式施設名カナ if self.record.hp_name_kana != '': @@ -196,41 +195,41 @@ class ComPharmMapper(UltmarcTableMapper): set_clauses.append('close_flg = :close_flg') set_clauses.append('close_start_ym = :close_yearmonth') if self.record.close_flg == '@': - self.query_parameter['close_flg'] = None - self.query_parameter['close_yearmonth'] = None + self.query_parameter['close_flg'] = '' + self.query_parameter['close_yearmonth'] = '' # 開業予定フラグ、開業予定年月 if len(self.record.open_flag + self.record.open_yearmonth) > 0: set_clauses.append('estab_sche_flg = :open_flag') set_clauses.append('estab_sche_ym = :open_yearmonth') if self.record.open_flag == '@': - self.query_parameter['open_flag'] = None - self.query_parameter['open_yearmonth'] = None + self.query_parameter['open_flag'] = '' + self.query_parameter['open_yearmonth'] = '' # 施設代表者カナ if self.record.president_Kana != '': set_clauses.append('inst_repre_kana = :president_Kana') - self.query_parameter['president_Kana'] = None if self.record.president_Kana == '@' else self.record.president_Kana + self.query_parameter['president_Kana'] = '' if self.record.president_Kana == '@' else self.record.president_Kana # 施設代表者 ※@が大文字 if self.record.president != '': set_clauses.append('inst_repre = :president') - self.query_parameter['president'] = None if self.record.president == '@' else self.record.president + self.query_parameter['president'] = '' if self.record.president == '@' else self.record.president # 電話番号なしフラグ if self.record.tel_nothing_flag != '': set_clauses.append('phone_number_non_flg = :tel_nothing_flag') - self.query_parameter['tel_nothing_flag'] = None if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag + self.query_parameter['tel_nothing_flag'] = '' if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag # 未確認フラグ if self.record.unconf_flg != '': set_clauses.append('unconf_flg = :unconf_flg') - self.query_parameter['unconf_flg'] = None if self.record.unconf_flg == '@' else self.record.unconf_flg + self.query_parameter['unconf_flg'] = '' if self.record.unconf_flg == '@' else self.record.unconf_flg # 施設電話番号 if self.record.tel_number != '': set_clauses.append('inst_phone_number = :tel_number') - self.query_parameter['tel_number'] = None if self.record.tel_number == '@' else self.record.tel_number + self.query_parameter['tel_number'] = '' if self.record.tel_number == '@' else self.record.tel_number # 施設住所カナ if self.record.addr_kana != '': @@ -256,7 +255,7 @@ class ComPharmMapper(UltmarcTableMapper): # 住所表示番号 if self.record.addr_number != '': set_clauses.append('addr_display_number = :addr_number') - self.query_parameter['addr_number'] = None if self.record.addr_number == '@' else self.record.addr_number + self.query_parameter['addr_number'] = '' if self.record.addr_number == '@' else self.record.addr_number # 住所カウント(集合項目である県コードが入っていればカウントをセットする) if len(self.record.prefc_cd) > 0: @@ -268,34 +267,34 @@ class ComPharmMapper(UltmarcTableMapper): # 経営体コード if self.record.mgtclass_code != '': set_clauses.append('manage_cd = :mgtclass_code') - self.query_parameter['mgtclass_code'] = None if self.record.mgtclass_code == '@' else self.record.mgtclass_code + self.query_parameter['mgtclass_code'] = '' if self.record.mgtclass_code == '@' else self.record.mgtclass_code # 削除予定理由コード if self.record.del_cd != '': set_clauses.append('delete_sche_reason_cd = :del_cd') - self.query_parameter['del_cd'] = None if self.record.del_cd == '@' else self.record.del_cd + self.query_parameter['del_cd'] = '' if self.record.del_cd == '@' else self.record.del_cd # 重複時相手先コード if self.record.dup_opp_cd != '': set_clauses.append('dup_opp_cd = :dup_opp_cd') - self.query_parameter['dup_opp_cd'] = None if self.record.dup_opp_cd == '@' else self.record.dup_opp_cd + self.query_parameter['dup_opp_cd'] = '' if self.record.dup_opp_cd == '@' else self.record.dup_opp_cd - # 管理薬剤師名(漢字) + # 管理薬剤師名(漢字)※@が大文字 if self.record.pharmacist != '': set_clauses.append('supervising_pharmacist = :pharmacist') - self.query_parameter['pharmacist'] = None if self.record.pharmacist == '@' else self.record.pharmacist + self.query_parameter['pharmacist'] = '' if self.record.pharmacist == '@' else self.record.pharmacist # 管理薬剤師名(カナ) if self.record.pharmacist_kana != '': set_clauses.append('supervising_pharmacist_kana = :pharmacist_kana') - self.query_parameter['pharmacist_kana'] = None if self.record.pharmacist_kana == '@' else self.record.pharmacist_kana + self.query_parameter['pharmacist_kana'] = '' if self.record.pharmacist_kana == '@' else self.record.pharmacist_kana # チェーン店本部コード if self.record.franchise_hq_id != '': set_clauses.append('franchise_hq_cd = :franchise_hq_cd') if self.record.franchise_hq_id == '@': - self.query_parameter['franchise_hq_id'] = None - self.query_parameter['franchise_hq_cd'] = None - self.query_parameter['franchise_hq_yobi'] = None + self.query_parameter['franchise_hq_id'] = '' + self.query_parameter['franchise_hq_cd'] = '' + self.query_parameter['franchise_hq_yobi'] = '' return set_clauses From 75aa631b64737d337b843112e57d0039b8975170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 18:19:00 +0900 Subject: [PATCH 25/69] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv index e6a84d8c..e806d922 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv @@ -1 +1,2 @@ -"102","9","9","9","C","200501","200601","7","0","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" \ No newline at end of file +"102","03","3673010",,"C","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","9","9","9","C","200501","200601","7","0","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" From de6183d68f59311ec9fc67785e735c4096b2e849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 19 Apr 2023 18:19:26 +0900 Subject: [PATCH 26/69] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_pharm/com_pharm_update.csv | 36 ++++++++++++++++++ .../com_pharm/db_com_pharm_before_delete.csv | 3 ++ .../com_pharm/db_com_pharm_before_update.csv | 37 +++++++++++++++++++ .../com_pharm/expect_com_pharm_delete.csv | 3 ++ .../com_pharm/expect_com_pharm_update.csv | 37 ++++++++++++++++++- 5 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv new file mode 100644 index 00000000..12427943 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv @@ -0,0 +1,36 @@ +"102","1","2","3","B",,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","4","5","6","B","200501","200601","6","7","55","56","57","正漢字","正カナ","略漢字","略カナ","0","61","62","63","64","001-6234","住所漢字","住所カナ","11","県","市","通","丁目","ケ","シ","ト","チ","0","119991234","11","66","代漢","代カナ","4","204411","8","204812","薬剤師漢字","薬剤師カナ","99","88","77" +"102","7","8","9","B","200501","200601","6","@","@",,,"正漢字","正カナ","略漢字","略カナ","@","61","62","63","64","001-6234","住所漢字","住所カナ","@","県","市","通","丁目","ケ","シ","ト","チ","@","@","@","66","@","@","@",,"@",,"@","@","@",,, +"102","03","3673002",,"B","20121128","20121129",,"5","03","3673003",,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673011",,"B","20121128","20121129","@",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673012",,"B","20121128","20121129",,"1",,,,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673013",,"B","20121128","20121129",,"2",,,,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673014",,"B","20121128","20121129",,"5","03","3673015",,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673016",,"B","20121128","20121129",,"7","03","3673021",,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673020",,"B","20121128","20121129",,"7","03","3673021",,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673022",,"B","20121128","20121129",,"@",,,,,,,,"@",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673023",,"B","20121128","20121129",,,,,,"正式店舗名03B03a差分","セイシキテンポメイ03B03Aサブン","略式03B03a差分","リヤクシキ03B03Aサブン",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673024",,"B","20121128","20121129",,,,,,"正式店舗名03B03b---+----2----+----3----+----4----+----5","セイシキテンポメイ03B03B---2----+----3----+----4----+----5----+----6----+----7----+----8","略式03B03b-1----+","リヤクシキ03B03B---+----2----+----3----+----4",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673025",,"B","20121128","20121129",,,,,,,,,,"1",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673026",,"B","20121128","20121129",,,,,,,,,,"2",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673030",,"B","20121128","20121129",,,,,,,,,,"@",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","03","3673031",,"B","20121128","20121129",,,,,,,,,,,"13","205","007","010","198-0036","東京都青梅市河辺町10-45-1 03B05a","トウキヨウト オウメシ カベマチ 10-45-1 03B05A","10-45-1-03B05","3","3","3","3","7","5","6","3",,,,,,,,,,,,,,,, +"102","03","3673032",,"B","20121128","20121129",,,,,,,,,,,"13","102","024","002","103-0007","東京都中央区日本橋浜町2-45-1 03B05b+----3----+----4----+----5","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B4----+----5----+----6","2-45-1-03B05B","3","3","5","2","7","7","12","2",,,,,,,,,,,,,,,, +"102","03","3673033",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,"@","03-3249-8231",,,,,,,,,,,,,, +"102","03","3673034",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,"03-3249-8232",,,,,,,,,,,,,, +"102","03","3673035",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,"1","@",,,,,,,,,,,,,, +"102","03","3673036",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,"472",,,,,,,,,,,,, +"102","03","3673040",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"86",,,,,,,,,,,, +"102","03","3673041",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"代表者名 03B09a","ダイヒヨウシヤメイ 03B09A",,,,,,,,,, +"102","03","3673042",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"代表者名 03B09b---+----2","ダイヒヨウシヤメイ 03B09B--2",,,,,,,,,, +"102","03","3673043",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"@","@",,,,,,,,,, +"102","03","3673044",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"1","201301",,,,,,,, +"102","03","3673045",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"@",,,,,,,,, +"102","03","3673046",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"1","201210",,,,,, +"102","03","3673047",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"1","201209",,,,,, +"102","03","3673048",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"@",,,,,,, +"102","03","3673051",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"管理薬剤師名 03B12a","カンリヤクザイシメイ 03B12A",,,, +"102","03","3673052",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"管理薬剤師名 03B12b-+----2","カンリヤクザイシメイ 03B12B-2",,,, +"102","03","3673053",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"@","@",,,, +"102","03","3673055",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"03","3673054",, +"102","03","3673061",,"B","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"03","3673060",, diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv new file mode 100644 index 00000000..9951f19e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv @@ -0,0 +1,3 @@ +"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" +"033673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv new file mode 100644 index 00000000..750492a9 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv @@ -0,0 +1,37 @@ +"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" +"456","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/18 10:27:00","com_pharm_mapper" +"789","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27","com_pharm_mapper","2023/4/18 10:27","com_pharm_mapper" +"033673002","85","","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85","","セイシキテンポメイ03B01A","リヤクシキ03B01A","正式店舗名03B01a","略式03B01a","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","東京都中央区日本橋浜町2-45-1 03B01a","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673012","85","","セイシキテンポメイ03B02A","リヤクシキ03B02A","正式店舗名03B02a","略式03B02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","東京都中央区日本橋浜町2-45-1 03B02a","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673013","85","6","セイシキテンポメイ03B02B","リヤクシキ03B02B","正式店舗名03B02b","略式03B02b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","東京都中央区日本橋浜町2-45-1 03B02b","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673014","85","","セイシキテンポメイ03B02C-01","リヤクシキ03B02C-01","正式店舗名03B02c-01","略式03B02c-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673016","85","","セイシキテンポメイ03B02D-01","リヤクシキ03B02D-01","正式店舗名03B02d-01","略式03B02d-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673020","85","","セイシキテンポメイ03B02D-02","リヤクシキ03B02D-02","正式店舗名03B02d-02","略式03B02d-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673022","85","6","セイシキテンポメイ03B02E","リヤクシキ03B02E","正式店舗名03B02e","略式03B02e","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","東京都中央区日本橋浜町2-45-1 03B02e","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673023","85","","セイシキテンポメイ03B03Aゼンケン","リヤクシキ03B03Aゼンケン","正式店舗名03B03a全件","略式03B03a全件","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","東京都中央区日本橋浜町2-45-1 03B03a","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673024","85","","セイシキテンポメイ03B03B","リヤクシキ03B03B","正式店舗名03B03b","略式03B03b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","東京都中央区日本橋浜町2-45-1 03B03b","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673025","85","","セイシキテンポメイ03B04A","リヤクシキ03B04A","正式店舗名03B04a","略式03B04a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","東京都中央区日本橋浜町2-45-1 03B04a","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673026","85","1","セイシキテンポメイ03B04B","リヤクシキ03B04B","正式店舗名03B04b","略式03B04b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","東京都中央区日本橋浜町2-45-1 03B04b","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673030","85","1","セイシキテンポメイ03B04C","リヤクシキ03B04C","正式店舗名03B04c","略式03B04c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","東京都中央区日本橋浜町2-45-1 03B04c","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673031","85","","セイシキテンポメイ03B05A","リヤクシキ03B05A","正式店舗名03B05a","略式03B05a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","東京都中央区日本橋浜町2-45-1 03B05a","103-0007","13102242","13","102","2-45-1-03B05A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673032","85","","セイシキテンポメイ03B05B","リヤクシキ03B05B","正式店舗名03B05b","略式03B05b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","東京都中央区日本橋浜町2-45-1 03B05b","103-0007","13102242","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673033","85","","セイシキテンポメイ03B06A","リヤクシキ03B06A","正式店舗名03B06a","略式03B06a","","","","","","","1","","","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","東京都中央区日本橋浜町2-45-1 03B06a","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673034","85","","セイシキテンポメイ03B06B","リヤクシキ03B06B","正式店舗名03B06b","略式03B06b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","東京都中央区日本橋浜町2-45-1 03B06b","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673035","85","","セイシキテンポメイ03B06C","リヤクシキ03B06C","正式店舗名03B06c","略式03B06c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","東京都中央区日本橋浜町2-45-1 03B06c","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673036","85","","セイシキテンポメイ03B07A","リヤクシキ03B07A","正式店舗名03B07a","略式03B07a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","東京都中央区日本橋浜町2-45-1 03B07a","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673040","85","","セイシキテンポメイ03B08A","リヤクシキ03B08A","正式店舗名03B08a","略式03B08a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","東京都中央区日本橋浜町2-45-1 03B08a","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673041","85","","セイシキテンポメイ03B09A","リヤクシキ03B09A","正式店舗名03B09a","略式03B09a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","東京都中央区日本橋浜町2-45-1 03B09a","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673042","85","","セイシキテンポメイ03B09B","リヤクシキ03B09B","正式店舗名03B09b","略式03B09b","","","","","ダイヒヨウシヤメイ 03B09B","代表者名 03B09b","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","東京都中央区日本橋浜町2-45-1 03B09b","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673043","85","","セイシキテンポメイ03B09C","リヤクシキ03B09C","正式店舗名03B09c","略式03B09c","","","","","ダイヒヨウシヤメイ 03B09C","代表者名 03B09c","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","東京都中央区日本橋浜町2-45-1 03B09c","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673044","85","","セイシキテンポメイ03B10A","リヤクシキ03B10A","正式店舗名03B10a","略式03B10a","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","東京都中央区日本橋浜町2-45-1 03B10a","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673045","85","","セイシキテンポメイ03B10B","リヤクシキ03B10B","正式店舗名03B10b","略式03B10b","","1","","201210","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","東京都中央区日本橋浜町2-45-1 03B10b","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673046","85","","セイシキテンポメイ03B11A","リヤクシキ03B11A","正式店舗名03B11a","略式03B11a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","東京都中央区日本橋浜町2-45-1 03B11a","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673047","85","","セイシキテンポメイ03B11B","リヤクシキ03B11B","正式店舗名03B11b","略式03B11b","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","東京都中央区日本橋浜町2-45-1 03B11b","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673048","85","","セイシキテンポメイ03B11C","リヤクシキ03B11C","正式店舗名03B11c","略式03B11c","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","東京都中央区日本橋浜町2-45-1 03B11c","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673051","85","","セイシキテンポメイ03B12A","リヤクシキ03B12A","正式店舗名03B12a","略式03B12a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","東京都中央区日本橋浜町2-45-1 03B12a","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673052","85","","セイシキテンポメイ03B12B","リヤクシキ03B12B","正式店舗名03B12b","略式03B12b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","東京都中央区日本橋浜町2-45-1 03B12b","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673053","85","","セイシキテンポメイ03B12C","リヤクシキ03B12C","正式店舗名03B12c","略式03B12c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","東京都中央区日本橋浜町2-45-1 03B12c","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673055","85","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673061","85","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","33673056","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv new file mode 100644 index 00000000..66e0e414 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv @@ -0,0 +1,3 @@ +"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"033673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","20121128","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","200501","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv index 9eb9020e..a428a914 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv @@ -1,3 +1,36 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","6","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" -"456","66","0","正カナ","略カナ","正漢字","略漢字","8","4","204812","204411","代カナ","代漢","0","6","119991234","住所カナ","住所漢字","001-6234","61626364","61","62","11","ケシトチ","県市通丁目","11","7","555657","薬剤師漢字","薬剤師カナ","998877","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/18 10:27:00","com_pharm_mapper" +"033673002","85","6","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","5","033673003","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85","","セイシキテンポメイ03B01A","リヤクシキ03B01A","正式店舗名03B01a","略式03B01a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","東京都中央区日本橋浜町2-45-1 03B01a","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673012","85","6","セイシキテンポメイ03B02A","リヤクシキ03B02A","正式店舗名03B02a","略式03B02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","東京都中央区日本橋浜町2-45-1 03B02a","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673013","85","6","セイシキテンポメイ03B02B","リヤクシキ03B02B","正式店舗名03B02b","略式03B02b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","東京都中央区日本橋浜町2-45-1 03B02b","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","2","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673014","85","6","セイシキテンポメイ03B02C-01","リヤクシキ03B02C-01","正式店舗名03B02c-01","略式03B02c-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","5","033673015","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673016","85","6","セイシキテンポメイ03B02D-01","リヤクシキ03B02D-01","正式店舗名03B02d-01","略式03B02d-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673020","85","6","セイシキテンポメイ03B02D-02","リヤクシキ03B02D-02","正式店舗名03B02d-02","略式03B02d-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673022","85","","セイシキテンポメイ03B02E","リヤクシキ03B02E","正式店舗名03B02e","略式03B02e","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","東京都中央区日本橋浜町2-45-1 03B02e","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673023","85","","セイシキテンポメイ03B03Aサブン","リヤクシキ03B03Aサブン","正式店舗名03B03a差分","略式03B03a差分","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","東京都中央区日本橋浜町2-45-1 03B03a","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673024","85","","セイシキテンポメイ03B03B---2----+----3----+----4----+----5----+----6----+----7----+----8","リヤクシキ03B03B---+----2----+----3----+----4","正式店舗名03B03b---+----2----+----3----+----4----+----5","略式03B03b-1----+","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","東京都中央区日本橋浜町2-45-1 03B03b","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673025","85","1","セイシキテンポメイ03B04A","リヤクシキ03B04A","正式店舗名03B04a","略式03B04a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","東京都中央区日本橋浜町2-45-1 03B04a","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673026","85","2","セイシキテンポメイ03B04B","リヤクシキ03B04B","正式店舗名03B04b","略式03B04b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","東京都中央区日本橋浜町2-45-1 03B04b","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673030","85","","セイシキテンポメイ03B04C","リヤクシキ03B04C","正式店舗名03B04c","略式03B04c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","東京都中央区日本橋浜町2-45-1 03B04c","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673032","85","","セイシキテンポメイ03B05B","リヤクシキ03B05B","正式店舗名03B05b","略式03B05b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B4----+----5----+----6","東京都中央区日本橋浜町2-45-1 03B05b+----3----+----4----+----5","103-0007","13102024002","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673033","85","","セイシキテンポメイ03B06A","リヤクシキ03B06A","正式店舗名03B06a","略式03B06a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","東京都中央区日本橋浜町2-45-1 03B06a","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673034","85","","セイシキテンポメイ03B06B","リヤクシキ03B06B","正式店舗名03B06b","略式03B06b","","","","","","","","","03-3249-8232","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","東京都中央区日本橋浜町2-45-1 03B06b","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673035","85","","セイシキテンポメイ03B06C","リヤクシキ03B06C","正式店舗名03B06c","略式03B06c","","","","","","","1","","","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","東京都中央区日本橋浜町2-45-1 03B06c","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673036","85","","セイシキテンポメイ03B07A","リヤクシキ03B07A","正式店舗名03B07a","略式03B07a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","東京都中央区日本橋浜町2-45-1 03B07a","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","472","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673040","86","","セイシキテンポメイ03B08A","リヤクシキ03B08A","正式店舗名03B08a","略式03B08a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","東京都中央区日本橋浜町2-45-1 03B08a","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673041","85","","セイシキテンポメイ03B09A","リヤクシキ03B09A","正式店舗名03B09a","略式03B09a","","","","","ダイヒヨウシヤメイ 03B09A","代表者名 03B09a","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","東京都中央区日本橋浜町2-45-1 03B09a","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673042","85","","セイシキテンポメイ03B09B","リヤクシキ03B09B","正式店舗名03B09b","略式03B09b","","","","","ダイヒヨウシヤメイ 03B09B--2","代表者名 03B09b---+----2","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","東京都中央区日本橋浜町2-45-1 03B09b","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673043","85","","セイシキテンポメイ03B09C","リヤクシキ03B09C","正式店舗名03B09c","略式03B09c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","東京都中央区日本橋浜町2-45-1 03B09c","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673044","85","","セイシキテンポメイ03B10A","リヤクシキ03B10A","正式店舗名03B10a","略式03B10a","","1","","201301","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","東京都中央区日本橋浜町2-45-1 03B10a","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673045","85","","セイシキテンポメイ03B10B","リヤクシキ03B10B","正式店舗名03B10b","略式03B10b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","東京都中央区日本橋浜町2-45-1 03B10b","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673046","85","","セイシキテンポメイ03B11A","リヤクシキ03B11A","正式店舗名03B11a","略式03B11a","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","東京都中央区日本橋浜町2-45-1 03B11a","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673047","85","","セイシキテンポメイ03B11B","リヤクシキ03B11B","正式店舗名03B11b","略式03B11b","1","","201209","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","東京都中央区日本橋浜町2-45-1 03B11b","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673048","85","","セイシキテンポメイ03B11C","リヤクシキ03B11C","正式店舗名03B11c","略式03B11c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","東京都中央区日本橋浜町2-45-1 03B11c","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673051","85","","セイシキテンポメイ03B12A","リヤクシキ03B12A","正式店舗名03B12a","略式03B12a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","東京都中央区日本橋浜町2-45-1 03B12a","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","管理薬剤師名 03B12a","カンリヤクザイシメイ 03B12A","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673052","85","","セイシキテンポメイ03B12B","リヤクシキ03B12B","正式店舗名03B12b","略式03B12b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","東京都中央区日本橋浜町2-45-1 03B12b","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名 03B12b-+----2","カンリヤクザイシメイ 03B12B-2","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673053","85","","セイシキテンポメイ03B12C","リヤクシキ03B12C","正式店舗名03B12c","略式03B12c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","東京都中央区日本橋浜町2-45-1 03B12c","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673055","85","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","033673054","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673061","85","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","033673060","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","6","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/19 08:27:33","com_pharm_mapper" +"456","66","0","正カナ","略カナ","正漢字","略漢字","8","4","204812","204411","代カナ","代漢","0","6","119991234","住所カナ","住所漢字","001-6234","61626364","61","62","11","ケシトチ","県市通丁目","11","7","555657","薬剤師漢字","薬剤師カナ","998877","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" +"789","66","","正カナ","略カナ","正漢字","略漢字","","","","","","","","6","","住所カナ","住所漢字","001-6234","61626364","61","62","","ケシトチ","県市通丁目","","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" From aca55d20f9ab44a66a7642c35c563402105a979b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 20 Apr 2023 10:55:23 +0900 Subject: [PATCH 27/69] =?UTF-8?q?feat:=20=E3=83=90=E3=83=83=E3=83=81?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E3=82=BF=E3=82=B9=E3=82=AF=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task_settings/batch_daily_task_settings.env | 16 ++++++++++++++++ .../batch_lanudering_task_settings.env | 8 ++++++++ .../batch_monthly_task_settings.env | 10 ++++++++++ .../task_settings/dbdump_task_settings.env | 7 +++++++ 4 files changed, 41 insertions(+) create mode 100644 s3/config/jskult/task_settings/batch_daily_task_settings.env create mode 100644 s3/config/jskult/task_settings/batch_lanudering_task_settings.env create mode 100644 s3/config/jskult/task_settings/batch_monthly_task_settings.env create mode 100644 s3/config/jskult/task_settings/dbdump_task_settings.env diff --git a/s3/config/jskult/task_settings/batch_daily_task_settings.env b/s3/config/jskult/task_settings/batch_daily_task_settings.env new file mode 100644 index 00000000..2590fe79 --- /dev/null +++ b/s3/config/jskult/task_settings/batch_daily_task_settings.env @@ -0,0 +1,16 @@ +# jskult batch daily task environment file. +LOG_LEVEL=DEBUG +ULTMARC_DATA_FOLDER=recv +VJSK_DATA_RECEIVE_FOLDER=recv +VJSK_DATA_SEND_FOLDER=send +ULTMARC_BACKUP_FOLDER=ultmarc +VJSK_BACKUP_FOLDER=vjsk +JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar +JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt +JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILENAME=jskult_wholesaler_stock_input_day_list.txt +SALES_LAUNDERING_EXTRACT_DATE_PERIOD=0 +SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau +DB_CONNECTION_MAX_RETRY_ATTEMPT=4 +DB_CONNECTION_RETRY_INTERVAL_INIT=5 +DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=5 +DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS=50 diff --git a/s3/config/jskult/task_settings/batch_lanudering_task_settings.env b/s3/config/jskult/task_settings/batch_lanudering_task_settings.env new file mode 100644 index 00000000..23a40f3f --- /dev/null +++ b/s3/config/jskult/task_settings/batch_lanudering_task_settings.env @@ -0,0 +1,8 @@ +# jskult batch lanudering task environment file. +LOG_LEVEL=DEBUG +SALES_LAUNDERING_EXTRACT_DATE_PERIOD=7 +SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau_all +DB_CONNECTION_MAX_RETRY_ATTEMPT=4 +DB_CONNECTION_RETRY_INTERVAL_INIT=5 +DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=5 +DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS=50 diff --git a/s3/config/jskult/task_settings/batch_monthly_task_settings.env b/s3/config/jskult/task_settings/batch_monthly_task_settings.env new file mode 100644 index 00000000..441779df --- /dev/null +++ b/s3/config/jskult/task_settings/batch_monthly_task_settings.env @@ -0,0 +1,10 @@ +# jskult batch monthly task environment file. +LOG_LEVEL=DEBUG +ARISJ_DATA_FOLDER=DATA +ARISJ_BACKUP_FOLDER=arisj +JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar +JSKULT_CONFIG_CALENDAR_ARISJ_OUTPUT_DAY_LIST_FILE_NAME=jskult_arisj_output_day_list.txt +DB_CONNECTION_MAX_RETRY_ATTEMPT=4 +DB_CONNECTION_RETRY_INTERVAL_INIT=5 +DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=5 +DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS=50 diff --git a/s3/config/jskult/task_settings/dbdump_task_settings.env b/s3/config/jskult/task_settings/dbdump_task_settings.env new file mode 100644 index 00000000..9620ee44 --- /dev/null +++ b/s3/config/jskult/task_settings/dbdump_task_settings.env @@ -0,0 +1,7 @@ +# jskult db dump task environment file. +LOG_LEVEL=DEBUG +DUMP_BACKUP_FOLDER=dump +DB_CONNECTION_MAX_RETRY_ATTEMPT=4 +DB_CONNECTION_RETRY_INTERVAL_INIT=5 +DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=5 +DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS=50 From 0bb0af582e7cf2b0199122badcbf7ab4e9594cae Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 20 Apr 2023 13:28:15 +0900 Subject: [PATCH 28/69] =?UTF-8?q?fix:=20=E8=AA=8D=E8=A8=BC=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=82=92=E5=90=AB=E3=82=93=E3=81=A0=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AF=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/.env | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 ecs/jskult-batch-daily/.env diff --git a/ecs/jskult-batch-daily/.env b/ecs/jskult-batch-daily/.env deleted file mode 100644 index 214b488c..00000000 --- a/ecs/jskult-batch-daily/.env +++ /dev/null @@ -1,10 +0,0 @@ -DB_HOST=localhost -DB_PORT=3306 -DB_USERNAME=root -DB_PASSWORD=admin -DB_SCHEMA=src05 -LOG_LEVEL=INFO -ULTMARC_DATA_BUCKET=**************** -ULTMARC_DATA_FOLDER=recv -ULTMARC_BACKUP_BUCKET=**************** -ULTMARC_BACKUP_FOLDER=ultmarc From 102e3318e4de5750b138a2a613d7875716644b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Thu, 20 Apr 2023 13:35:46 +0900 Subject: [PATCH 29/69] =?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, 'アルトマーク施設統合マスタ(洗替処理一時テーブル)作成② 終了' From 453fdb087b3f1a6b33303a05ef8df0e68e88b4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:21:47 +0900 Subject: [PATCH 30/69] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/concrete/com_pharm_mapper.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index fbe7542f..ded33379 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -248,9 +248,6 @@ class ComPharmMapper(UltmarcTableMapper): set_clauses.append('village_cd = :village_code') # 住所コード set_clauses.append('prefc_cd = :prefc_cd') # 都道府県コード set_clauses.append('city_cd = :city_cd') # 市区町村コード - self.record.village_code - self.record.prefc_cd - self.record.city_cd # 住所表示番号 if self.record.addr_number != '': @@ -261,8 +258,6 @@ class ComPharmMapper(UltmarcTableMapper): if len(self.record.prefc_cd) > 0: set_clauses.append('addr_cnt = :addr_count') # 住所カウント set_clauses.append('addr_cnt_kana = :addr_count_kana') # 住所カウントカナ - self.record.addr_count - self.record.addr_count_kana # 経営体コード if self.record.mgtclass_code != '': From 4e59971966f81ea50596462fe794e2b45ae65008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:22:27 +0900 Subject: [PATCH 31/69] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/com_pharm/test_com_pharm_mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py index 6b9bc7cf..8d190859 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py @@ -28,13 +28,13 @@ class TestComPharmMapper: # setup self.db = database self.db.connect() - # self.db.begin() + self.db.begin() # testing yield # teardown - # self.db.rollback() + self.db.rollback() self.db.disconnect() def test_insert_record(self): From f838146b319fda3d262ae73cf0910170da11e87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:28:05 +0900 Subject: [PATCH 32/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index 4656d290..8482de45 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, com_pharm_mapper, null_mapper) + com_inst_mapper, com_pharm_mapper, com_forfront_med_equip_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -60,7 +60,7 @@ COM_TABLE_LIST = { # COM_高度先進医療 "021": com_hamtec_mapper.ComHamtecMapper, # COM_先端医療機器 - "022": null_mapper.NullMapper, + "022": com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, # COM_看護種別 "023": null_mapper.NullMapper, # COM_医療機能評価 From 5deec338edfbefa359bf1c04b9dc4b74e5c2481c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:28:56 +0900 Subject: [PATCH 33/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py new file mode 100644 index 00000000..62496980 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -0,0 +1,93 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfrontMedEquip + + +class ComForfrontMedEquipMapper(UltmarcTableMapper): + """レイアウト区分102: COM_薬局 登録処理 """ + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_forfront_med_equip + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_forfront_med_equip + ( + forfront_med_equip_cd, + forfront_med_equip_name, + regist_ymd, + update_ymd, + delete_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :hi_medicmach_code, + :hi_medicmach_name, + :execute_datetime, + :execute_datetime, + NULL, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + # 更新用SQL + UPDATE_QUERY = """\ + UPDATE src05.com_forfront_med_equip + SET + forfront_med_equip_name = :hi_medicmach_name, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + + # 修正区分が「C(削除)」の場合の更新SQL + # 削除年月日 ← システム日付 + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_forfront_med_equip + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + record: ComForfrontMedEquip + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComPharm) + program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + # モジュール名をクエリパラメータに設定 + self.query_parameter['program_name'] = program_name + # 読み込んだレコード値もクエリパラメータに追加 + self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + + def make_query(self): + # 修正区分がC(削除)の場合、論理削除 + if self.record.maint_flag == 'C': + self.queries.append(self.LOGICAL_DELETE_QUERY) + return + + # レコードの存在確認 + record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert + if record_count[0]['count_num'] == 0: + self.queries.append(self.INSERT_QUERY) + return + + # 更新の場合 + if self.record.hi_medicmach_name != '': + self.queries.append(update_query) + return From 143ba78b3802577961f221487afe27746a26ff55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:29:27 +0900 Subject: [PATCH 34/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/.env | 3 +++ .../utmp_tables/tables/com_forfront_med_equip.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py diff --git a/ecs/jskult-batch-daily/.env b/ecs/jskult-batch-daily/.env index 214b488c..96e2c07f 100644 --- a/ecs/jskult-batch-daily/.env +++ b/ecs/jskult-batch-daily/.env @@ -6,5 +6,8 @@ DB_SCHEMA=src05 LOG_LEVEL=INFO ULTMARC_DATA_BUCKET=**************** ULTMARC_DATA_FOLDER=recv +JSKULT_BACKUP_BUCKET=**************** ULTMARC_BACKUP_BUCKET=**************** ULTMARC_BACKUP_FOLDER=ultmarc +JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar +JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py new file mode 100644 index 00000000..261ca07c --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py @@ -0,0 +1,15 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComForfrontMedEquip(UltmarcTable): + """レイアウト区分022: COM_先端医療機器""" + hi_medicmach_code: str # 先進医療機器コード + hi_medicmach_name: str # 先端医療機器名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + + self.hi_medicmach_code = record[1] + self.hi_medicmach_name = record[4] + self.maint_flag = record[2] From 5eb217a048248eca988c78c16ed3f2ea7205e2ec Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 20 Apr 2023 15:53:27 +0900 Subject: [PATCH 35/69] =?UTF-8?q?feat:=20Web=E3=82=A2=E3=83=97=E3=83=AA?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=82=B9=E3=82=AF=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/config/jskult/task_settings/web_task_settings.env | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 s3/config/jskult/task_settings/web_task_settings.env diff --git a/s3/config/jskult/task_settings/web_task_settings.env b/s3/config/jskult/task_settings/web_task_settings.env new file mode 100644 index 00000000..9cd4ecf8 --- /dev/null +++ b/s3/config/jskult/task_settings/web_task_settings.env @@ -0,0 +1,6 @@ +# webapp task environment file. +AWS_REGION=ap-northeast-1 +AUTHORIZE_ENDPOINT=oauth2/authorize +TOKEN_ENDPOINT=oauth2/token +BIO_SEARCH_RESULT_MAX_COUNT=35000 +SESSION_EXPIRE_MINUTE=20 From b0fbacc2eb4b961b71fa1c94271e39b0854683c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:28:05 +0900 Subject: [PATCH 36/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index ebea9e55..faf872ad 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, null_mapper) + com_inst_mapper, com_pharm_mapper, com_forfront_med_equip_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -60,7 +60,7 @@ COM_TABLE_LIST = { # COM_高度先進医療 "021": com_hamtec_mapper.ComHamtecMapper, # COM_先端医療機器 - "022": null_mapper.NullMapper, + "022": com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, # COM_看護種別 "023": null_mapper.NullMapper, # COM_医療機能評価 From 5047c9c02ab65f3f8e3d7583c66e8d9d9972a3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:28:56 +0900 Subject: [PATCH 37/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py new file mode 100644 index 00000000..62496980 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -0,0 +1,93 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfrontMedEquip + + +class ComForfrontMedEquipMapper(UltmarcTableMapper): + """レイアウト区分102: COM_薬局 登録処理 """ + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_forfront_med_equip + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_forfront_med_equip + ( + forfront_med_equip_cd, + forfront_med_equip_name, + regist_ymd, + update_ymd, + delete_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :hi_medicmach_code, + :hi_medicmach_name, + :execute_datetime, + :execute_datetime, + NULL, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + # 更新用SQL + UPDATE_QUERY = """\ + UPDATE src05.com_forfront_med_equip + SET + forfront_med_equip_name = :hi_medicmach_name, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + + # 修正区分が「C(削除)」の場合の更新SQL + # 削除年月日 ← システム日付 + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_forfront_med_equip + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + forfront_med_equip_cd = :hi_medicmach_code + """ + record: ComForfrontMedEquip + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComPharm) + program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + # モジュール名をクエリパラメータに設定 + self.query_parameter['program_name'] = program_name + # 読み込んだレコード値もクエリパラメータに追加 + self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + + def make_query(self): + # 修正区分がC(削除)の場合、論理削除 + if self.record.maint_flag == 'C': + self.queries.append(self.LOGICAL_DELETE_QUERY) + return + + # レコードの存在確認 + record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert + if record_count[0]['count_num'] == 0: + self.queries.append(self.INSERT_QUERY) + return + + # 更新の場合 + if self.record.hi_medicmach_name != '': + self.queries.append(update_query) + return From da81de238d2136a70447d7985d5e59673b853e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 14:29:27 +0900 Subject: [PATCH 38/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/tables/com_forfront_med_equip.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py new file mode 100644 index 00000000..261ca07c --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py @@ -0,0 +1,15 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComForfrontMedEquip(UltmarcTable): + """レイアウト区分022: COM_先端医療機器""" + hi_medicmach_code: str # 先進医療機器コード + hi_medicmach_name: str # 先端医療機器名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + + self.hi_medicmach_code = record[1] + self.hi_medicmach_name = record[4] + self.maint_flag = record[2] From f615f9b6d36016160595b55b7746c1d46d2be084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 18:21:28 +0900 Subject: [PATCH 39/69] =?UTF-8?q?Revert=20"=E5=85=88=E9=80=B2=E5=8C=BB?= =?UTF-8?q?=E7=99=82=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 143ba78b3802577961f221487afe27746a26ff55. --- .../utmp_tables/tables/com_forfront_med_equip.py | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py deleted file mode 100644 index 261ca07c..00000000 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py +++ /dev/null @@ -1,15 +0,0 @@ -from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable - - -class ComForfrontMedEquip(UltmarcTable): - """レイアウト区分022: COM_先端医療機器""" - hi_medicmach_code: str # 先進医療機器コード - hi_medicmach_name: str # 先端医療機器名 - maint_flag: str # 修正区分 - - def __init__(self, record: list[str]): - super().__init__(record) - - self.hi_medicmach_code = record[1] - self.hi_medicmach_name = record[4] - self.maint_flag = record[2] From 5f7cdc9af6db8cebd6451d50009ce57b9632c08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 18:21:53 +0900 Subject: [PATCH 40/69] =?UTF-8?q?Revert=20"=E5=85=88=E9=80=B2=E5=8C=BB?= =?UTF-8?q?=E7=99=82=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5deec338edfbefa359bf1c04b9dc4b74e5c2481c. --- .../concrete/com_forfront_med_equip_mapper.py | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py deleted file mode 100644 index 62496980..00000000 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ /dev/null @@ -1,93 +0,0 @@ -from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ - UltmarcTableMapper -from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfrontMedEquip - - -class ComForfrontMedEquipMapper(UltmarcTableMapper): - """レイアウト区分102: COM_薬局 登録処理 """ - - # レコード存在確認SQL - RECORD_EXISTS_QUERY = """\ - SELECT - COUNT(*) AS count_num - FROM - src05.com_forfront_med_equip - WHERE - forfront_med_equip_cd = :hi_medicmach_code - """ - # データ登録用SQL - INSERT_QUERY = """\ - INSERT INTO src05.com_forfront_med_equip - ( - forfront_med_equip_cd, - forfront_med_equip_name, - regist_ymd, - update_ymd, - delete_ymd, - sys_regist_date, - regist_prgm_id, - sys_update_date, - update_prgm_id - ) - VALUES ( - :hi_medicmach_code, - :hi_medicmach_name, - :execute_datetime, - :execute_datetime, - NULL, - :execute_datetime, - :program_name, - :execute_datetime, - :program_name - ) - """ - # 更新用SQL - UPDATE_QUERY = """\ - UPDATE src05.com_forfront_med_equip - SET - forfront_med_equip_name = :hi_medicmach_name, - sys_update_date = :execute_datetime, - update_prgm_id = :program_name - WHERE - forfront_med_equip_cd = :hi_medicmach_code - """ - - # 修正区分が「C(削除)」の場合の更新SQL - # 削除年月日 ← システム日付 - LOGICAL_DELETE_QUERY = """\ - UPDATE - src05.com_forfront_med_equip - SET - delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, - update_prgm_id = :program_name - WHERE - forfront_med_equip_cd = :hi_medicmach_code - """ - record: ComForfrontMedEquip - - def __init__(self, record: list[str], db) -> None: - super().__init__(record, db, ComPharm) - program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) - # モジュール名をクエリパラメータに設定 - self.query_parameter['program_name'] = program_name - # 読み込んだレコード値もクエリパラメータに追加 - self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} - - def make_query(self): - # 修正区分がC(削除)の場合、論理削除 - if self.record.maint_flag == 'C': - self.queries.append(self.LOGICAL_DELETE_QUERY) - return - - # レコードの存在確認 - record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) - # 存在しない場合はInsert - if record_count[0]['count_num'] == 0: - self.queries.append(self.INSERT_QUERY) - return - - # 更新の場合 - if self.record.hi_medicmach_name != '': - self.queries.append(update_query) - return From d18caacc88993355f51ab15d71539796e816d2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 18:21:59 +0900 Subject: [PATCH 41/69] =?UTF-8?q?Revert=20"=E5=85=88=E9=80=B2=E5=8C=BB?= =?UTF-8?q?=E7=99=82=E6=A9=9F=E5=99=A8=E3=80=80=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f838146b319fda3d262ae73cf0910170da11e87a. --- .../batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index 8482de45..4656d290 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, com_pharm_mapper, com_forfront_med_equip_mapper, null_mapper) + com_inst_mapper, com_pharm_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -60,7 +60,7 @@ COM_TABLE_LIST = { # COM_高度先進医療 "021": com_hamtec_mapper.ComHamtecMapper, # COM_先端医療機器 - "022": com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, + "022": null_mapper.NullMapper, # COM_看護種別 "023": null_mapper.NullMapper, # COM_医療機能評価 From d3fd0f7898ad3dbb14a55ee7727fcd8137c70018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 20 Apr 2023 18:32:06 +0900 Subject: [PATCH 42/69] =?UTF-8?q?=E5=85=88=E9=80=B2=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 16 +- .../tables/com_forfront_med_equip.py | 3 +- .../com_forfront_med_equip/__init__.py | 0 .../com_forfront_med_equip_delete.csv | 1 + .../com_forfront_med_equip_insert.csv | 1 + .../com_forfront_med_equip_update.csv | 2 + ...b_com_forfront_med_equip_before_delete.csv | 2 + ...b_com_forfront_med_equip_before_update.csv | 3 + .../expect_com_forfront_med_equip_delete.csv | 2 + .../expect_com_forfront_med_equip_insert.csv | 2 + .../expect_com_forfront_med_equip_update.csv | 3 + .../test_com_forfront_med_equip_mapper.py | 197 ++++++++++++++++++ 12 files changed, 222 insertions(+), 10 deletions(-) create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py index 62496980..3c4c4e18 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -1,10 +1,10 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ - UltmarcTableMapper +UltmarcTableMapper + from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfrontMedEquip - class ComForfrontMedEquipMapper(UltmarcTableMapper): - """レイアウト区分102: COM_薬局 登録処理 """ + """レイアウト区分022: COM_先進医療機器 登録処理 """ # レコード存在確認SQL RECORD_EXISTS_QUERY = """\ @@ -32,8 +32,8 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): VALUES ( :hi_medicmach_code, :hi_medicmach_name, - :execute_datetime, - :execute_datetime, + :execute_date_str_ymd, + :execute_date_str_ymd, NULL, :execute_datetime, :program_name, @@ -59,7 +59,7 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): src05.com_forfront_med_equip SET delete_ymd = :execute_date_str_ymd, - sys_update_date = :execute_date_str_ymd, + sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE forfront_med_equip_cd = :hi_medicmach_code @@ -67,7 +67,7 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): record: ComForfrontMedEquip def __init__(self, record: list[str], db) -> None: - super().__init__(record, db, ComPharm) + super().__init__(record, db, ComForfrontMedEquip) program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) # モジュール名をクエリパラメータに設定 self.query_parameter['program_name'] = program_name @@ -89,5 +89,5 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): # 更新の場合 if self.record.hi_medicmach_name != '': - self.queries.append(update_query) + self.queries.append(self.UPDATE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py index 261ca07c..a7559d0e 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_forfront_med_equip.py @@ -9,7 +9,6 @@ class ComForfrontMedEquip(UltmarcTable): def __init__(self, record: list[str]): super().__init__(record) - self.hi_medicmach_code = record[1] - self.hi_medicmach_name = record[4] + self.hi_medicmach_name = record[5] self.maint_flag = record[2] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv new file mode 100644 index 00000000..11deb49c --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv @@ -0,0 +1 @@ +"022","99","C",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv new file mode 100644 index 00000000..80c3e354 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv @@ -0,0 +1 @@ +"022","99","A",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv new file mode 100644 index 00000000..251fc712 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv @@ -0,0 +1,2 @@ +"022","98","B",,,"" +"022","99","B",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv new file mode 100644 index 00000000..2153bc3e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv @@ -0,0 +1,2 @@ +"forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv new file mode 100644 index 00000000..416587f9 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv @@ -0,0 +1,3 @@ +"forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"99","あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv new file mode 100644 index 00000000..9d109626 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv @@ -0,0 +1,2 @@ +"forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv new file mode 100644 index 00000000..2153bc3e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv @@ -0,0 +1,2 @@ +"forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv new file mode 100644 index 00000000..b5527022 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv @@ -0,0 +1,3 @@ +"forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py new file mode 100644 index 00000000..b5d4cc09 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py @@ -0,0 +1,197 @@ +import os.path as path +from datetime import datetime + +import pytest + +from src.batch.common.batch_config import BatchConfig +from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_forfront_med_equip_mapper +from src.db.database import Database +from tests.testing_utility import (assert_table_results, + create_db_data_from_csv, + create_delete_sql_with_parameter, + create_insert_sql_with_parameter, + create_ultmarc_table_mapper_sut, + create_ultmarc_test_data_from_csv) + + +class TestComForfrontMedEquipMapper: + """ レイアウト区分022: COM_先端医療機器 """ + + db: Database + batch_config: BatchConfig + test_file_path: str = path.dirname(__file__) + + @pytest.fixture(autouse=True, scope='function') + def pre_test(self, database: Database): + """ テスト実行前後処理 """ + self.batch_config = BatchConfig.get_instance() + # setup + self.db = database + self.db.connect() + self.db.begin() + + # testing + yield + + # teardown + self.db.rollback() + self.db.disconnect() + + def test_insert_record(self): + """ + Cases: + COM_先端医療機器テーブルにレコードを登録する + Arranges: + - CSVデータを用意し、読み込む + - 追加対象となるレコードを削除する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_forfront_med_equip', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_forfront_med_equip_mapper.ComForfrontMedEquipMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, f'{line_number}行目:マッパークラスが期通りか' + + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_forfront_med_equip_insert.csv')) + primary_keys = [f"'{primary_key['forfront_med_equip_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_update_record(self): + """ + Cases: + COM_先端医療機器テーブルのレコードを更新する + Arranges: + - CSVデータを用意し、読み込む + - 更新対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_forfront_med_equip', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_forfront_med_equip_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_forfront_med_equip', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_forfront_med_equip_mapper.ComForfrontMedEquipMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_forfront_med_equip_update.csv')) + primary_keys = [f"'{primary_key['forfront_med_equip_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_logical_delete(self): + """ + Cases: + COM_先端医療機器テーブルのレコードを1件論理削除する + Arranges: + - CSVデータを用意し、読み込む + - 削除対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_forfront_med_equip', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_forfront_med_equip_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_forfront_med_equip', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_forfront_med_equip_mapper.ComForfrontMedEquipMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_forfront_med_equip_delete.csv')) + primary_keys = [f"'{primary_key['forfront_med_equip_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['sys_update_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' From 8efa0e9204621acf0d507ab572d8bbce8b444100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 09:36:57 +0900 Subject: [PATCH 43/69] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_forfront_med_equip_mapper.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py index 3c4c4e18..d8ed1786 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -91,3 +91,6 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): if self.record.hi_medicmach_name != '': self.queries.append(self.UPDATE_QUERY) return + else: + return None + From 79447d3534e403a01f739f8f07d123c816f0a2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 10:07:33 +0900 Subject: [PATCH 44/69] =?UTF-8?q?=E5=B7=AE=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 7 ++++--- .../utmp_tables/ultmarc_table_mapper_factory.py | 2 +- .../test_com_forfront_med_equip_mapper.py | 12 ++++++------ ecs/jskult-batch-daily/tests/testing_utility.py | 7 ++++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py index d8ed1786..00ebc987 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -1,8 +1,9 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ -UltmarcTableMapper + UltmarcTableMapper from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfrontMedEquip + class ComForfrontMedEquipMapper(UltmarcTableMapper): """レイアウト区分022: COM_先進医療機器 登録処理 """ @@ -92,5 +93,5 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): self.queries.append(self.UPDATE_QUERY) return else: - return None - + self.queries.append(None) + return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index faf872ad..54507832 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, com_pharm_mapper, com_forfront_med_equip_mapper, null_mapper) + com_inst_mapper, com_forfront_med_equip_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py index b5d4cc09..fccc56ad 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py @@ -3,7 +3,7 @@ from datetime import datetime import pytest -from src.batch.common.batch_config import BatchConfig +from src.batch.common.batch_context import BatchContext from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_forfront_med_equip_mapper from src.db.database import Database from tests.testing_utility import (assert_table_results, @@ -18,13 +18,13 @@ class TestComForfrontMedEquipMapper: """ レイアウト区分022: COM_先端医療機器 """ db: Database - batch_config: BatchConfig + batch_context: BatchContext test_file_path: str = path.dirname(__file__) @pytest.fixture(autouse=True, scope='function') def pre_test(self, database: Database): """ テスト実行前後処理 """ - self.batch_config = BatchConfig.get_instance() + self.batch_context = BatchContext.get_instance() # setup self.db = database self.db.connect() @@ -50,7 +50,7 @@ class TestComForfrontMedEquipMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_insert.csv')) # 一旦全データをDBから削除 @@ -95,7 +95,7 @@ class TestComForfrontMedEquipMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_update.csv')) # 一旦全データをDBから削除 @@ -152,7 +152,7 @@ class TestComForfrontMedEquipMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_forfront_med_equip_delete.csv')) # 一旦全データをDBから削除 diff --git a/ecs/jskult-batch-daily/tests/testing_utility.py b/ecs/jskult-batch-daily/tests/testing_utility.py index e95da8e7..5a6c3a42 100644 --- a/ecs/jskult-batch-daily/tests/testing_utility.py +++ b/ecs/jskult-batch-daily/tests/testing_utility.py @@ -1,5 +1,5 @@ -"""テスト用共通処理関数""" import csv +import os import tempfile from datetime import datetime @@ -22,12 +22,13 @@ def create_ultmarc_test_data_from_csv(file_path: str) -> DatFile: """ # 一度、Shift-JISファイルで書き出す - with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932') as tmp_file: + with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932', delete=False) as tmp_file: tmp_file.write(csv_file.read()) tmp_file.seek(0) tmpfile_path = tmp_file.name - dat_file = DatFile.from_path(tmpfile_path) + dat_file = DatFile.from_path(tmpfile_path) + os.unlink(tmpfile_path) return dat_file From 0b05b04cabfae7db09b112b944e15a00b7c9ab1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 10:11:16 +0900 Subject: [PATCH 45/69] =?UTF-8?q?=E5=B7=AE=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/com_pharm/test_com_pharm_mapper.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py index 8d190859..1cdd738c 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py @@ -3,7 +3,7 @@ from datetime import datetime import pytest -from src.batch.common.batch_config import BatchConfig +from src.batch.common.batch_context import BatchContext from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_pharm_mapper from src.db.database import Database from tests.testing_utility import (assert_table_results, @@ -18,13 +18,13 @@ class TestComPharmMapper: """ レイアウト区分102: COM_薬局 """ db: Database - batch_config: BatchConfig + batch_context: BatchContext test_file_path: str = path.dirname(__file__) @pytest.fixture(autouse=True, scope='function') def pre_test(self, database: Database): """ テスト実行前後処理 """ - self.batch_config = BatchConfig.get_instance() + self.batch_context = BatchContext.get_instance() # setup self.db = database self.db.connect() @@ -50,7 +50,7 @@ class TestComPharmMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_insert.csv')) # 一旦全データをDBから削除 @@ -95,7 +95,7 @@ class TestComPharmMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_update.csv')) # 一旦全データをDBから削除 @@ -152,7 +152,7 @@ class TestComPharmMapper: # Arrange # 処理日設定 - self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') # テスト用のCSVを読み込む test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_pharm_delete.csv')) # 一旦全データをDBから削除 From 55674e03e9fa5877f36423f14139aacc78c784ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 10:17:36 +0900 Subject: [PATCH 46/69] =?UTF-8?q?win=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/tests/testing_utility.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/testing_utility.py b/ecs/jskult-batch-daily/tests/testing_utility.py index e95da8e7..5a6c3a42 100644 --- a/ecs/jskult-batch-daily/tests/testing_utility.py +++ b/ecs/jskult-batch-daily/tests/testing_utility.py @@ -1,5 +1,5 @@ -"""テスト用共通処理関数""" import csv +import os import tempfile from datetime import datetime @@ -22,12 +22,13 @@ def create_ultmarc_test_data_from_csv(file_path: str) -> DatFile: """ # 一度、Shift-JISファイルで書き出す - with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932') as tmp_file: + with open(file_path, encoding='utf8') as csv_file, tempfile.NamedTemporaryFile('w', encoding='cp932', delete=False) as tmp_file: tmp_file.write(csv_file.read()) tmp_file.seek(0) tmpfile_path = tmp_file.name - dat_file = DatFile.from_path(tmpfile_path) + dat_file = DatFile.from_path(tmpfile_path) + os.unlink(tmpfile_path) return dat_file From 59f0a2704d3e239bfb793cbee41599fbbf493820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 10:52:37 +0900 Subject: [PATCH 47/69] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index ded33379..8be2741b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -147,17 +147,18 @@ class ComPharmMapper(UltmarcTableMapper): # 更新の場合 update_columns = ','.join(self.__make_update_query()) - - # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる - if len(update_columns) > 0: + # 何も更新項目が無い場合はNoneとする(更新処理は行わない) + if len(update_columns) == 0: + self.queries.append(None) + return + else: + # 末尾にカンマを付けてSET句を完成させる update_columns += ',' - - update_query = self.UPDATE_QUERY.format( - update_columns=update_columns - ) - - self.queries.append(update_query) - return + update_query = self.UPDATE_QUERY.format( + update_columns=update_columns + ) + self.queries.append(update_query) + return def __make_update_query(self): set_clauses = [] # 設定項目 From 53cea74369ad3ad022681c9b139eb7a7b8f86a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 11:31:15 +0900 Subject: [PATCH 48/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/com_pharm/com_pharm_update.csv | 1 + .../table_mapper/com_pharm/db_com_pharm_before_update.csv | 1 + .../table_mapper/com_pharm/expect_com_pharm_update.csv | 1 + 3 files changed, 3 insertions(+) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv index 12427943..c2f3a2a9 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_update.csv @@ -1,4 +1,5 @@ "102","1","2","3","B",,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"102","9","9","9","B",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "102","4","5","6","B","200501","200601","6","7","55","56","57","正漢字","正カナ","略漢字","略カナ","0","61","62","63","64","001-6234","住所漢字","住所カナ","11","県","市","通","丁目","ケ","シ","ト","チ","0","119991234","11","66","代漢","代カナ","4","204411","8","204812","薬剤師漢字","薬剤師カナ","99","88","77" "102","7","8","9","B","200501","200601","6","@","@",,,"正漢字","正カナ","略漢字","略カナ","@","61","62","63","64","001-6234","住所漢字","住所カナ","@","県","市","通","丁目","ケ","シ","ト","チ","@","@","@","66","@","@","@",,"@",,"@","@","@",,, "102","03","3673002",,"B","20121128","20121129",,"5","03","3673003",,,,,,"6",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv index 750492a9..398d83cd 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_update.csv @@ -1,5 +1,6 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" +"999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" "456","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/18 10:27:00","com_pharm_mapper" "789","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27","com_pharm_mapper","2023/4/18 10:27","com_pharm_mapper" "033673002","85","","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv index a428a914..dccf6b06 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv @@ -34,3 +34,4 @@ "123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","6","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/19 08:27:33","com_pharm_mapper" "456","66","0","正カナ","略カナ","正漢字","略漢字","8","4","204812","204411","代カナ","代漢","0","6","119991234","住所カナ","住所漢字","001-6234","61626364","61","62","11","ケシトチ","県市通丁目","11","7","555657","薬剤師漢字","薬剤師カナ","998877","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" "789","66","","正カナ","略カナ","正漢字","略漢字","","","","","","","","6","","住所カナ","住所漢字","001-6234","61626364","61","62","","ケシトチ","県市通丁目","","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" +"999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" From ab6920e16aa3d46bbd36e3e48faea59fb7b048c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 12:39:22 +0900 Subject: [PATCH 49/69] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E6=89=8B=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=EF=BC=88?= =?UTF-8?q?alma=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/concrete/com_alma_mapper.py | 7 +++++-- .../table_mapper/com_alma/db_com_alma_before_delete.csv | 2 +- .../table_mapper/com_alma/expect_com_alma_delete.csv | 2 +- .../table_mapper/com_alma/expect_com_alma_update.csv | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py index 5963aa3f..699cbe6c 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py @@ -88,5 +88,8 @@ class ComAlmaMapper(UltmarcTableMapper): if record_count[0]['count_num'] == 0: return self.INSERT_QUERY - # 存在する場合はUpdate - return self.UPDATE_QUERY + # 存在する場合ではUpdate + if self.record.alma == '': + return None + else: + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv index 259afa23..2aa73354 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv @@ -2,6 +2,6 @@ "001","北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" "002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" "003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" -"004",,"20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"004","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 11:35:27","clsComAlma" "005","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" "006","福島医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv index 6cb36d4b..afaca4a8 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv @@ -2,7 +2,7 @@ "001","北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" "002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" "003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" -"004","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"004","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","clsComAlma" "005","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" "006","福島医","20171020","20171020","20171020","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" "007","群馬大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:43:15","com_alma_mapper","2017/10/20 10:43:15","com_alma_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv index 50811ab3..4fc8b3bc 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv @@ -2,7 +2,7 @@ "001","北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" "002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" "003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" -"004",,"20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"004","岩手医","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" "005","福島医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" "006","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" -"007","神大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","com_alma_mapper","2017/10/20 10:35:27","com_alma_mapper" +"007","神大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","com_alma_mapper","2017/10/20 10:35:27","com_alma_mapper" \ No newline at end of file From b28f7f1612b6ababaa1f5e87d4eba3babd04377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 14:16:38 +0900 Subject: [PATCH 50/69] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=E4=B8=AD=EF=BC=88?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=93=E3=81=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_dr_wrkplace_mapper.py | 13 +++++++------ .../com_dr_wrkplace/com_dr_wrkplace_update.csv | 3 ++- .../db_com_dr_wrkplace_before_update.csv | 1 + .../expect_com_dr_wrkplace_update.csv | 17 +++++++++-------- .../test_com_dr_wrkplace_mapper.py | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py index 8b9253a2..eacaadae 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py @@ -4,7 +4,7 @@ from src.batch.ultmarc.utmp_tables.tables.com_dr_wrkplace import ComDrWrkplace class ComDrWrkplaceMapper(UltmarcTableMapper): - """レイアウト区分501-01:COM_医師勤務先 登録処理""" + """レイアウト区分502:COM_医師勤務先 登録処理""" # レコード存在確認SQL RECORD_EXISTS_QUERY = """\ @@ -212,13 +212,14 @@ class ComDrWrkplaceMapper(UltmarcTableMapper): make_history_query = self.TO_HISTORY_QUERY update_columns = ','.join(set_clauses_with_historical + set_clause_without_historical) - if len(update_columns) > 0: + if len(update_columns) == 0: + update_query = None + else: # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる update_columns += ',' - - update_query = self.UPDATE_QUERY.format( - update_columns=update_columns - ) + update_query = self.UPDATE_QUERY.format( + update_columns=update_columns + ) return [make_history_query, update_query] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv index 73c4c336..5cc42095 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv @@ -2,4 +2,5 @@ "502","01","995783","","B","00","5507600","","","20170907","20170910","@","802","@","@","@","" "502","01","997682","","A","00","5408060","","","20141113","20141114","","","","","","" "502","01","997682","","B","00","5402984","","","20141113","20141114","165","@","","","","" -"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ナイブンピ.ホネタイシヤガイライ","" \ No newline at end of file +"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ナイブンピ.ホネタイシヤガイライ","" +"502","01","999999","","B","00","5409446","","","20170906","20170910","","","","","","" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv index f0da440a..8113fcc1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv @@ -9,3 +9,4 @@ "005504428","01997906","7212",,"144","2020-02-22","ユケツ.サイボウチリヨウガク","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005507600","01997906","9114",,"144","2020-02-22","サイボウイシヨクブモン","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005504428","01999613","5140",,"144","2020-02-22","ヤクリガク","薬理学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" +"005409446","01999999","1118",,,"2020-02-22","ケツエキナイカ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:54:00","com_dr_wrkplace_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv index 1cee6ac3..cce6de1e 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv @@ -1,11 +1,12 @@ "dcf_dsf_inst_cd","dcf_pcf_dr_cd","blng_sec_cd","post_cd","identity_cd","aply_start_ymd","blng_sec_name_kana","blng_sec_name","notdm_flg","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "005414992","01995783",,"501",,"2020-02-22",,,,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005507600","01995783","9999",,"802","2020-02-23","NULL","NULL","1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005402984","01997682","1512","165",,"2020-02-23","シヨウカキゲカ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005412977","01997682","6720",,"144","2020-02-22","シヨウカキゲカガク","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" -"005409446","01997906","1118","501",,"2020-02-22","ケツエキナイカ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005503358","01997906","1118","172","144","2020-02-22","ケツエキナイカ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" -"005504428","01997906","7212",,"144","2020-02-22","ユケツ.サイボウチリヨウガク","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" -"005507600","01997906","9114",,"144","2020-02-22","サイボウイシヨクブモン","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" -"005504428","01999613","9999","501","144","2020-02-23","ナイブンピ.ホネタイシヤガイライ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" \ No newline at end of file +"005402984","01997682","1512","165",,"2020-02-23","シヨウカキゲカ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" +"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","clsComDrWrk" +"005412977","01997682","6720",,"144","2020-02-22","シヨウカキゲカガク","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005409446","01997906","1118","501",,"2020-02-22","ケツエキナイカ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" +"005409446","01999999","1118",,,"2020-02-22","ケツエキナイカ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:00:00","com_dr_wrkplace_mapper" +"005503358","01997906","1118","172","144","2020-02-22","ケツエキナイカ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005504428","01997906","7212",,"144","2020-02-22","ユケツ.サイボウチリヨウガク","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005507600","01997906","9114",,"144","2020-02-22","サイボウイシヨクブモン","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005504428","01999613","9999","501","144","2020-02-23","ナイブンピ.ホネタイシヤガイライ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py index 89e65b54..e532513d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py @@ -29,13 +29,13 @@ class TestComDrWrkplaceMapper: # setup self.db = database self.db.connect() - self.db.begin() + # self.db.begin() # testing yield # teardown - self.db.rollback() + # self.db.rollback() self.db.disconnect() def test_insert_record(self): From d64d6d2d4589c236f2f3a12612d979b20da714a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 15:38:13 +0900 Subject: [PATCH 51/69] =?UTF-8?q?=E5=85=88=E7=AB=AF=E5=8C=BB=E7=99=82?= =?UTF-8?q?=E6=A9=9F=E5=99=A8=E3=80=80=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 5 ++--- .../com_forfront_med_equip_delete.csv | 6 ++++++ .../com_forfront_med_equip_insert.csv | 6 ++++++ .../com_forfront_med_equip_update.csv | 7 ++++++- .../db_com_forfront_med_equip_before_delete.csv | 6 ++++++ .../db_com_forfront_med_equip_before_update.csv | 10 ++++++++-- .../expect_com_forfront_med_equip_delete.csv | 8 +++++++- .../expect_com_forfront_med_equip_insert.csv | 8 +++++++- .../expect_com_forfront_med_equip_update.csv | 10 ++++++++-- .../test_com_forfront_med_equip_mapper.py | 4 ++-- 10 files changed, 58 insertions(+), 12 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py index 00ebc987..2892d074 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -5,7 +5,7 @@ from src.batch.ultmarc.utmp_tables.tables.com_forfront_med_equip import ComForfr class ComForfrontMedEquipMapper(UltmarcTableMapper): - """レイアウト区分022: COM_先進医療機器 登録処理 """ + """レイアウト区分022: COM_先端医療機器 登録処理 """ # レコード存在確認SQL RECORD_EXISTS_QUERY = """\ @@ -23,7 +23,6 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): forfront_med_equip_cd, forfront_med_equip_name, regist_ymd, - update_ymd, delete_ymd, sys_regist_date, regist_prgm_id, @@ -34,7 +33,6 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): :hi_medicmach_code, :hi_medicmach_name, :execute_date_str_ymd, - :execute_date_str_ymd, NULL, :execute_datetime, :program_name, @@ -47,6 +45,7 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): UPDATE src05.com_forfront_med_equip SET forfront_med_equip_name = :hi_medicmach_name, + update_ymd = :execute_date_str_ymd, sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv index 11deb49c..39f5dce7 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv @@ -1 +1,7 @@ +"022","11","A","20141113","20141114","" +"022","12","A","20141113","20141114","X線CT" +"022","13","A","20141113","20141114","CR" +"022","14","C","20141113","20141114","血管造影システム" +"022","15","A","20141113","20141114","アンガー型カメラ" +"022","16","A","20141113","20141114","SPECT" "022","99","C",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv index 80c3e354..fe5ae507 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_insert.csv @@ -1 +1,7 @@ +"022","11","A","20141113","20141114","MRI" +"022","12","A","20141113","20141114","X線CT" +"022","13","A","20141113","20141114","CR" +"022","14","A","20141113","20141114","血管造影システム" +"022","15","A","20141113","20141114","SPECT" +"022","16","A","20141113","20141114","アンガー型カメラ" "022","99","A",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv index 251fc712..5ae8452f 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_update.csv @@ -1,2 +1,7 @@ -"022","98","B",,,"" +"022","11","B","20141113","20141114","" +"022","12","B","20141113","20141114","X線CT" +"022","13","B","20141113","20141114","CR" +"022","14","B","20141113","20141114","血管造影システム" +"022","15","B","20141113","20141114","アンガー型カメラ" +"022","16","B","20141113","20141114","SPECT" "022","99","B",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv index 2153bc3e..e9b7e50d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_delete.csv @@ -1,2 +1,8 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"11","MRI","20171023","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:07:41","clsComForfrontMedEqu" +"12","X線CT","20171023","20171023","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","clsComForfrontMedEqu" +"13","CR","20171023","20171023","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","clsComForfrontMedEqu" +"14","血管造影システム","20171023","20171023","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","clsComForfrontMedEqu" +"15","アンガー型カメラ","20171023","20171023","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","clsComForfrontMedEqu" +"16","SPECT","20171023","20171023","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","clsComForfrontMedEqu" "99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv index 416587f9..716c01cc 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/db_com_forfront_med_equip_before_update.csv @@ -1,3 +1,9 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" -"99","あいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえおあいうえお","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"11","MRI","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/21 10:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"12","X線CT","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"13","CR","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"14","血管造影システム","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"15","SPECT","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"16","アンガー型カメラ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv index 9d109626..0eead53f 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv @@ -1,2 +1,8 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"11","MRI","20171023","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:07:41","clsComForfrontMedEqu" +"12","X線CT","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"13","CR","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"14","血管造影システム","20171023","20171023","20230421","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:14:25","com_forfront_med_equip_mapper" +"15","アンガー型カメラ","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"16","SPECT","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230421","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv index 2153bc3e..4c37e0fd 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_insert.csv @@ -1,2 +1,8 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"11","MRI","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/21 10:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"12","X線CT","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"13","CR","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"14","血管造影システム","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"15","SPECT","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"16","アンガー型カメラ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","com_forfront_med_equip_mapper","2017/10/23 15:01:26","com_forfront_med_equip_mapper" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv index b5527022..133e13a9 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv @@ -1,3 +1,9 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" -"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230420","20230420","20230420","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"11","MRI","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/21 10:01:26","clsComForfrontMedEqu","2017/10/23 10:07:41","com_forfront_med_equip_mapper" +"12","X線CT","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"13","CR","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"14","血管造影システム","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"15","アンガー型カメラ","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"16","SPECT","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" +"98","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" +"99","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_forfront_med_equip_mapper","2023/04/19 00:00:00","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py index fccc56ad..73292fd8 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py @@ -28,13 +28,13 @@ class TestComForfrontMedEquipMapper: # setup self.db = database self.db.connect() - self.db.begin() + # self.db.begin() # testing yield # teardown - self.db.rollback() + # self.db.rollback() self.db.disconnect() def test_insert_record(self): From 864a99f03a1ca8aaa6f6ba054847290b6f2bf376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 16:23:54 +0900 Subject: [PATCH 52/69] =?UTF-8?q?=E5=85=83=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expect_com_dr_wrkplace_update.csv | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv index cce6de1e..867d9fe5 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv @@ -1,12 +1,11 @@ "dcf_dsf_inst_cd","dcf_pcf_dr_cd","blng_sec_cd","post_cd","identity_cd","aply_start_ymd","blng_sec_name_kana","blng_sec_name","notdm_flg","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "005414992","01995783",,"501",,"2020-02-22",,,,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005507600","01995783","9999",,"802","2020-02-23","NULL","NULL","1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005402984","01997682","1512","165",,"2020-02-23","シヨウカキゲカ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" -"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","clsComDrWrk" -"005412977","01997682","6720",,"144","2020-02-22","シヨウカキゲカガク","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" -"005409446","01997906","1118","501",,"2020-02-22","ケツエキナイカ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" -"005409446","01999999","1118",,,"2020-02-22","ケツエキナイカ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:00:00","com_dr_wrkplace_mapper" -"005503358","01997906","1118","172","144","2020-02-22","ケツエキナイカ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" -"005504428","01997906","7212",,"144","2020-02-22","ユケツ.サイボウチリヨウガク","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" -"005507600","01997906","9114",,"144","2020-02-22","サイボウイシヨクブモン","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" -"005504428","01999613","9999","501","144","2020-02-23","ナイブンピ.ホネタイシヤガイライ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" +"005402984","01997682","1512","165",,"2020-02-23","シヨウカキゲカ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" +"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" +"005412977","01997682","6720",,"144","2020-02-22","シヨウカキゲカガク","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" +"005409446","01997906","1118","501",,"2020-02-22","ケツエキナイカ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" +"005503358","01997906","1118","172","144","2020-02-22","ケツエキナイカ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" +"005504428","01997906","7212",,"144","2020-02-22","ユケツ.サイボウチリヨウガク","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" +"005507600","01997906","9114",,"144","2020-02-22","サイボウイシヨクブモン","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" +"005504428","01999613","9999","501","144","2020-02-23","ナイブンピ.ホネタイシヤガイライ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" From 9aea1a589ad5de1af902f096ac5bb679ab11b4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 16:24:45 +0900 Subject: [PATCH 53/69] =?UTF-8?q?DB=E3=81=AE=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=A4=96=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test_com_forfront_med_equip_mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py index 73292fd8..fccc56ad 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py @@ -28,13 +28,13 @@ class TestComForfrontMedEquipMapper: # setup self.db = database self.db.connect() - # self.db.begin() + self.db.begin() # testing yield # teardown - # self.db.rollback() + self.db.rollback() self.db.disconnect() def test_insert_record(self): From 3bdc7495b5b65e16def9fc1907c2b74216cef82a Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 21 Apr 2023 16:28:47 +0900 Subject: [PATCH 54/69] =?UTF-8?q?feat:=20=E6=97=A5=E6=AC=A1=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=81=AEStepFunctions=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 47 +++++++++++- .../r-jskult-batch-daily-state.json | 72 +++++++++++++++++++ 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index be3baa0e..b2822e23 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -20,6 +20,14 @@ resource: - &STG_SG_ECS_ALL "sg-051e0fb9925539592" # セキュリティグループ(ecs-crm-datafetch) - &STG_SG_CRM_DATAFETCH "sg-0b20b7bb1cb1ab886" + # セキュリティグループ(ecs-jskult-batch-daily) + - &STG_SG_JSKULT_BATCH_DAILY "sg-020b3f6a5a6d6a3a0" + # セキュリティグループ(ecs-jskult-batch-monthly) + - &STG_SG_JSKULT_BATCH_MONTHLY "sg-05c7ad620d69e6f5f" + # セキュリティグループ(ecs-jskult-dbdump) + - &STG_SG_JSKULT_DBDUMP "sg-0967779af13538a8e" + # セキュリティグループ(ecs-jskult-batch-laundering) + - &STG_SG_JSKULT_BATCH_LAUNDERING "sg-00b9ea30c5c6bb77a" # 本番環境 product: # サブネット(PrivateSubnet1) @@ -30,7 +38,15 @@ resource: - &PRD_SG_ECS_ALL "sg-05df4823fc789b0fa" # セキュリティグループ(ecs-crm-datafetch) - &PRD_SG_CRM_DATAFETCH "sg-04de7fc3357d852af" - + # TODO: 本番リリース時にIDを正式化する + # セキュリティグループ(ecs-jskult-batch-daily) + - &PRD_SG_JSKULT_BATCH_DAILY "sg-xxxxxxxxxxxxxxxx" + # セキュリティグループ(ecs-jskult-batch-monthly) + - &PRD_SG_JSKULT_BATCH_MONTHLY "sg-xxxxxxxxxxxxxxxx" + # セキュリティグループ(ecs-jskult-dbdump) + - &PRD_SG_JSKULT_DBDUMP "sg-xxxxxxxxxxxxxxxx" + # セキュリティグループ(ecs-jskult-batch-laundering) + - &PRD_SG_JSKULT_BATCH_LAUNDERING "sg-xxxxxxxxxxxxxxxx" config: r-crm-datafetch-state: # ステージング環境 @@ -74,3 +90,32 @@ config: AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID # 東京リージョン REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + r-jskult-batch-daily-state: + # ステージング環境 + staging: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *STG_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *STG_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *STG_SG_ECS_ALL + # セキュリティグループ(ecs-crm-datafetch) + SG_JSKULT_BATCH_DAILY: *STG_SG_JSKULT_BATCH_DAILY + # 本番環境 + product: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *PRD_SG_ECS_ALL + # セキュリティグループ(ecs-crm-datafetch) + SG_JSKULT_BATCH_DAILY: *PRD_SG_JSKULT_BATCH_DAILY diff --git a/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json b/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json new file mode 100644 index 00000000..10f36de2 --- /dev/null +++ b/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json @@ -0,0 +1,72 @@ +{ + "Comment": "MeDaCA 実消化&アルトマーク 日次バッチ起動ステートマシン", + "StartAt": "params", + "States": { + "params": { + "Comment": "パラメータ設定", + "Type": "Pass", + "Parameters": { + "sns": { + "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}" + }, + "ecs": { + "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-jskult-batch-daily-ecs", + "LaunchType": "FARGATE", + "NetworkConfiguration": { + "AwsvpcConfiguration": { + "Subnets": [ + "#{SUBNET_PRI_1A}", + "#{SUBNET_PRI_1D}" + ], + "SecurityGroups": [ + "#{SG_ECS_ALL}", + "#{SG_JSKULT_BATCH_DAILY}" + ], + "AssignPublicIp": "DISABLED" + } + } + } + }, + "ResultPath": "$.params", + "Next": "exec-batch-daily" + }, + "exec-batch-daily": { + "Comment": "実消化&アルトマーク 日次バッチ", + "Type": "Task", + "Resource": "arn:aws:states:::ecs:runTask.sync", + "Parameters": { + "Cluster.$": "$.params.ecs.Cluster", + "LaunchType.$": "$.params.ecs.LaunchType", + "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-jskult-batch-daily", + "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration" + }, + "Retry": [ + { + "ErrorEquals": ["States.ALL"], + "BackoffRate": 2, + "IntervalSeconds": 5, + "MaxAttempts": 3 + } + ], + "Catch": [ + { + "ErrorEquals": ["States.ALL"], + "ResultPath": "$.result", + "Next": "ErrorEnd" + } + ], + "ResultPath": "$.result", + "Next": "NormalEnd" + }, + "NormalEnd": { + "Comment": "正常終了", + "Type": "Succeed" + }, + "ErrorEnd": { + "Comment": "異常終了", + "Type": "Fail", + "Error": "StatesError", + "Cause": "StepFunctions ErrorEnd" + } + } +} From b52f8e6611812c6dbaaefcb94cfd72a2837b9876 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 21 Apr 2023 16:37:27 +0900 Subject: [PATCH 55/69] =?UTF-8?q?feat:=20=E6=9C=88=E6=AC=A1=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=81=AE=E3=82=B9=E3=83=86=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=9E=E3=82=B7=E3=83=B3=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 37 +++++++++- .../r-jskult-batch-monthly-state.json | 72 +++++++++++++++++++ 2 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index b2822e23..ef81ab5e 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -48,6 +48,7 @@ resource: # セキュリティグループ(ecs-jskult-batch-laundering) - &PRD_SG_JSKULT_BATCH_LAUNDERING "sg-xxxxxxxxxxxxxxxx" config: + # CRMデータ取得 r-crm-datafetch-state: # ステージング環境 staging: @@ -77,6 +78,7 @@ config: SG_ECS_ALL: *PRD_SG_ECS_ALL # セキュリティグループ(ecs-crm-datafetch) SG_CRM_DATAFETCH: *PRD_SG_CRM_DATAFETCH + # データ登録処理 r-data-import-state: # ステージング環境 staging: @@ -90,6 +92,7 @@ config: AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID # 東京リージョン REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # 実消化&アルトマーク 日次バッチ r-jskult-batch-daily-state: # ステージング環境 staging: @@ -103,7 +106,7 @@ config: SUBNET_PRI_1D: *STG_SUBNET_PRI_1D # セキュリティグループ(ecs-all) SG_ECS_ALL: *STG_SG_ECS_ALL - # セキュリティグループ(ecs-crm-datafetch) + # セキュリティグループ(ecs-jskut-batch-daily) SG_JSKULT_BATCH_DAILY: *STG_SG_JSKULT_BATCH_DAILY # 本番環境 product: @@ -117,5 +120,35 @@ config: SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D # セキュリティグループ(ecs-all) SG_ECS_ALL: *PRD_SG_ECS_ALL - # セキュリティグループ(ecs-crm-datafetch) + # セキュリティグループ(ecs-jskut-batch-daily) SG_JSKULT_BATCH_DAILY: *PRD_SG_JSKULT_BATCH_DAILY + # 実消化&アルトマーク 月次バッチ + r-jskult-batch-monthly-state: + # ステージング環境 + staging: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *STG_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *STG_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *STG_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-batch-daily) + SG_JSKULT_BATCH_MONTHLY: *STG_SG_JSKULT_BATCH_MONTHLY + # 本番環境 + product: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *PRD_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-batch-daily) + SG_JSKULT_BATCH_MONTHLY: *PRD_SG_JSKULT_BATCH_MONTHLY diff --git a/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json b/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json new file mode 100644 index 00000000..e149bc4a --- /dev/null +++ b/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json @@ -0,0 +1,72 @@ +{ + "Comment": "MeDaCA 実消化&アルトマーク 月次バッチ起動ステートマシン", + "StartAt": "params", + "States": { + "params": { + "Comment": "パラメータ設定", + "Type": "Pass", + "Parameters": { + "sns": { + "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}" + }, + "ecs": { + "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-jskult-batch-monthly-ecs", + "LaunchType": "FARGATE", + "NetworkConfiguration": { + "AwsvpcConfiguration": { + "Subnets": [ + "#{SUBNET_PRI_1A}", + "#{SUBNET_PRI_1D}" + ], + "SecurityGroups": [ + "#{SG_ECS_ALL}", + "#{SG_JSKULT_BATCH_MONTHLY}" + ], + "AssignPublicIp": "DISABLED" + } + } + } + }, + "ResultPath": "$.params", + "Next": "exec-batch-monthly" + }, + "exec-batch-monthly": { + "Comment": "実消化&アルトマーク 日次バッチ", + "Type": "Task", + "Resource": "arn:aws:states:::ecs:runTask.sync", + "Parameters": { + "Cluster.$": "$.params.ecs.Cluster", + "LaunchType.$": "$.params.ecs.LaunchType", + "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-jskult-batch-monthly", + "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration" + }, + "Retry": [ + { + "ErrorEquals": ["States.ALL"], + "BackoffRate": 2, + "IntervalSeconds": 5, + "MaxAttempts": 3 + } + ], + "Catch": [ + { + "ErrorEquals": ["States.ALL"], + "ResultPath": "$.result", + "Next": "ErrorEnd" + } + ], + "ResultPath": "$.result", + "Next": "NormalEnd" + }, + "NormalEnd": { + "Comment": "正常終了", + "Type": "Succeed" + }, + "ErrorEnd": { + "Comment": "異常終了", + "Type": "Fail", + "Error": "StatesError", + "Cause": "StepFunctions ErrorEnd" + } + } +} From 2a1eeabb02eee0bf0e6b8c0a8183c131d02ebb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 17:03:42 +0900 Subject: [PATCH 56/69] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=EF=BC=88=E5=8C=BB=E5=B8=AB=E5=8B=A4?= =?UTF-8?q?=E5=8B=99=E5=85=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_dr_wrkplace/expect_com_dr_wrkplace_update.csv | 2 +- .../com_dr_wrkplace/test_com_dr_wrkplace_mapper.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv index 867d9fe5..142895a6 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv @@ -2,7 +2,7 @@ "005414992","01995783",,"501",,"2020-02-22",,,,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005507600","01995783","9999",,"802","2020-02-23","NULL","NULL","1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" "005402984","01997682","1512","165",,"2020-02-23","シヨウカキゲカ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" -"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" +"005408060","01997682","6802",,"144","2020-02-22","シヨウカキゲカガク1","消化器外科学Ⅰ",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005412977","01997682","6720",,"144","2020-02-22","シヨウカキゲカガク","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" "005409446","01997906","1118","501",,"2020-02-22","ケツエキナイカ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper" "005503358","01997906","1118","172","144","2020-02-22","ケツエキナイカ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py index e532513d..89e65b54 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py @@ -29,13 +29,13 @@ class TestComDrWrkplaceMapper: # setup self.db = database self.db.connect() - # self.db.begin() + self.db.begin() # testing yield # teardown - # self.db.rollback() + self.db.rollback() self.db.disconnect() def test_insert_record(self): From a5d48cbff8e85b71d86b2ab8a103a74267e1dd08 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 21 Apr 2023 17:12:02 +0900 Subject: [PATCH 57/69] =?UTF-8?q?feat:=20=E6=97=A5=E6=AC=A1dump=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=AE=E3=82=B9=E3=83=86=E3=83=BC=E3=83=88=E3=83=9E?= =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 30 ++++++++ .../r-jskult-batch-daily-state.json | 2 +- .../r-jskult-batch-monthly-state.json | 2 +- .../r-jskult-dbdump-state.json | 72 +++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index ef81ab5e..172bfbbd 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -152,3 +152,33 @@ config: SG_ECS_ALL: *PRD_SG_ECS_ALL # セキュリティグループ(ecs-jskut-batch-daily) SG_JSKULT_BATCH_MONTHLY: *PRD_SG_JSKULT_BATCH_MONTHLY + # 実消化&アルトマーク 日次dump取得 + r-jskult-dbdump-state: + # ステージング環境 + staging: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *STG_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *STG_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *STG_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-dbdump) + SG_JSKULT_DBDUMP: *STG_SG_JSKULT_DBDUMP + # 本番環境 + product: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *PRD_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-dbdump) + SG_JSKULT_DBDUMP: *PRD_SG_JSKULT_DBDUMP diff --git a/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json b/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json index 10f36de2..07964c60 100644 --- a/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json +++ b/stepfunctions/r-jskult-batch-daily-state/r-jskult-batch-daily-state.json @@ -31,7 +31,7 @@ "Next": "exec-batch-daily" }, "exec-batch-daily": { - "Comment": "実消化&アルトマーク 日次バッチ", + "Comment": "実消化&アルトマーク 日次バッチ起動", "Type": "Task", "Resource": "arn:aws:states:::ecs:runTask.sync", "Parameters": { diff --git a/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json b/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json index e149bc4a..468127bc 100644 --- a/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json +++ b/stepfunctions/r-jskult-batch-monthly-state/r-jskult-batch-monthly-state.json @@ -31,7 +31,7 @@ "Next": "exec-batch-monthly" }, "exec-batch-monthly": { - "Comment": "実消化&アルトマーク 日次バッチ", + "Comment": "実消化&アルトマーク 月次バッチ起動", "Type": "Task", "Resource": "arn:aws:states:::ecs:runTask.sync", "Parameters": { diff --git a/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json new file mode 100644 index 00000000..dbcfb4b4 --- /dev/null +++ b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json @@ -0,0 +1,72 @@ +{ + "Comment": "MeDaCA 実消化&アルトマーク 日次dump取得ステートマシン", + "StartAt": "params", + "States": { + "params": { + "Comment": "パラメータ設定", + "Type": "Pass", + "Parameters": { + "sns": { + "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}" + }, + "ecs": { + "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-jskult-dbdump-ecs", + "LaunchType": "FARGATE", + "NetworkConfiguration": { + "AwsvpcConfiguration": { + "Subnets": [ + "#{SUBNET_PRI_1A}", + "#{SUBNET_PRI_1D}" + ], + "SecurityGroups": [ + "#{SG_ECS_ALL}", + "#{SG_JSKULT_DBDUMP}" + ], + "AssignPublicIp": "DISABLED" + } + } + } + }, + "ResultPath": "$.params", + "Next": "exec-batch-monthly" + }, + "exec-batch-monthly": { + "Comment": "実消化&アルトマーク 日次dump取得起動", + "Type": "Task", + "Resource": "arn:aws:states:::ecs:runTask.sync", + "Parameters": { + "Cluster.$": "$.params.ecs.Cluster", + "LaunchType.$": "$.params.ecs.LaunchType", + "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-jskult-dbdump", + "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration" + }, + "Retry": [ + { + "ErrorEquals": ["States.ALL"], + "BackoffRate": 2, + "IntervalSeconds": 5, + "MaxAttempts": 3 + } + ], + "Catch": [ + { + "ErrorEquals": ["States.ALL"], + "ResultPath": "$.result", + "Next": "ErrorEnd" + } + ], + "ResultPath": "$.result", + "Next": "NormalEnd" + }, + "NormalEnd": { + "Comment": "正常終了", + "Type": "Succeed" + }, + "ErrorEnd": { + "Comment": "異常終了", + "Type": "Fail", + "Error": "StatesError", + "Cause": "StepFunctions ErrorEnd" + } + } +} From efdc0a0a2398f1c616a120d8a38f377242a00576 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 21 Apr 2023 17:42:43 +0900 Subject: [PATCH 58/69] =?UTF-8?q?feat:=20=E5=AE=9F=E7=B8=BE=E5=85=A8?= =?UTF-8?q?=E4=BB=B6=E6=B4=97=E6=9B=BF=E3=83=90=E3=83=83=E3=83=81=E3=81=AE?= =?UTF-8?q?=E3=82=B9=E3=83=86=E3=83=BC=E3=83=88=E3=83=9E=E3=82=B7=E3=83=B3?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 34 ++++++++- .../r-jskult-batch-laundering-state.json | 72 +++++++++++++++++++ .../r-jskult-dbdump-state.json | 4 +- 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index 172bfbbd..c68ae70a 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -136,7 +136,7 @@ config: SUBNET_PRI_1D: *STG_SUBNET_PRI_1D # セキュリティグループ(ecs-all) SG_ECS_ALL: *STG_SG_ECS_ALL - # セキュリティグループ(ecs-jskut-batch-daily) + # セキュリティグループ(ecs-jskut-batch-monthly) SG_JSKULT_BATCH_MONTHLY: *STG_SG_JSKULT_BATCH_MONTHLY # 本番環境 product: @@ -150,7 +150,7 @@ config: SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D # セキュリティグループ(ecs-all) SG_ECS_ALL: *PRD_SG_ECS_ALL - # セキュリティグループ(ecs-jskut-batch-daily) + # セキュリティグループ(ecs-jskut-batch-monthly) SG_JSKULT_BATCH_MONTHLY: *PRD_SG_JSKULT_BATCH_MONTHLY # 実消化&アルトマーク 日次dump取得 r-jskult-dbdump-state: @@ -182,3 +182,33 @@ config: SG_ECS_ALL: *PRD_SG_ECS_ALL # セキュリティグループ(ecs-jskut-dbdump) SG_JSKULT_DBDUMP: *PRD_SG_JSKULT_DBDUMP + # 実消化&アルトマーク 実績洗替バッチ + r-jskult-batch-laundering-state: + # ステージング環境 + staging: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *STG_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *STG_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *STG_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-batch-laundering) + SG_JSKULT_BATCH_LAUNDERING: *STG_SG_JSKULT_BATCH_LAUNDERING + # 本番環境 + product: + # AWSアカウントID + AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID + # 東京リージョン + REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1 + # サブネット(PrivateSubnet1) + SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A + # サブネット(PrivateSubnet2) + SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D + # セキュリティグループ(ecs-all) + SG_ECS_ALL: *PRD_SG_ECS_ALL + # セキュリティグループ(ecs-jskut-batch-laundering) + SG_JSKULT_BATCH_LAUNDERING: *STG_SG_JSKULT_BATCH_LAUNDERING diff --git a/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json b/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json new file mode 100644 index 00000000..c720e349 --- /dev/null +++ b/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json @@ -0,0 +1,72 @@ +{ + "Comment": "MeDaCA 実消化&アルトマーク 実績全件洗替バッチ起動ステートマシン", + "StartAt": "params", + "States": { + "params": { + "Comment": "パラメータ設定", + "Type": "Pass", + "Parameters": { + "sns": { + "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}" + }, + "ecs": { + "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-jskult-batch-laundering-ecs", + "LaunchType": "FARGATE", + "NetworkConfiguration": { + "AwsvpcConfiguration": { + "Subnets": [ + "#{SUBNET_PRI_1A}", + "#{SUBNET_PRI_1D}" + ], + "SecurityGroups": [ + "#{SG_ECS_ALL}", + "#{SG_JSKULT_BATCH_LAUNDERING}" + ], + "AssignPublicIp": "DISABLED" + } + } + } + }, + "ResultPath": "$.params", + "Next": "exec-batch-laundering" + }, + "exec-batch-laundering": { + "Comment": "実消化&アルトマーク 実績全件洗替バッチ起動", + "Type": "Task", + "Resource": "arn:aws:states:::ecs:runTask.sync", + "Parameters": { + "Cluster.$": "$.params.ecs.Cluster", + "LaunchType.$": "$.params.ecs.LaunchType", + "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-jskult-batch-laundering", + "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration" + }, + "Retry": [ + { + "ErrorEquals": ["States.ALL"], + "BackoffRate": 2, + "IntervalSeconds": 5, + "MaxAttempts": 3 + } + ], + "Catch": [ + { + "ErrorEquals": ["States.ALL"], + "ResultPath": "$.result", + "Next": "ErrorEnd" + } + ], + "ResultPath": "$.result", + "Next": "NormalEnd" + }, + "NormalEnd": { + "Comment": "正常終了", + "Type": "Succeed" + }, + "ErrorEnd": { + "Comment": "異常終了", + "Type": "Fail", + "Error": "StatesError", + "Cause": "StepFunctions ErrorEnd" + } + } +} diff --git a/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json index dbcfb4b4..47fc9208 100644 --- a/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json +++ b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json @@ -28,9 +28,9 @@ } }, "ResultPath": "$.params", - "Next": "exec-batch-monthly" + "Next": "exec-dbdump" }, - "exec-batch-monthly": { + "exec-dbdump": { "Comment": "実消化&アルトマーク 日次dump取得起動", "Type": "Task", "Resource": "arn:aws:states:::ecs:runTask.sync", From a50d021ae5639f997425f5d3bc0dafb2603cc1ec Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 21 Apr 2023 17:44:27 +0900 Subject: [PATCH 59/69] =?UTF-8?q?feat:=20=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D?= =?UTF-8?q?=E3=81=AEtypo=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ing_task_settings.env => batch_laundering_task_settings.env} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename s3/config/jskult/task_settings/{batch_lanudering_task_settings.env => batch_laundering_task_settings.env} (84%) diff --git a/s3/config/jskult/task_settings/batch_lanudering_task_settings.env b/s3/config/jskult/task_settings/batch_laundering_task_settings.env similarity index 84% rename from s3/config/jskult/task_settings/batch_lanudering_task_settings.env rename to s3/config/jskult/task_settings/batch_laundering_task_settings.env index 23a40f3f..c80314cf 100644 --- a/s3/config/jskult/task_settings/batch_lanudering_task_settings.env +++ b/s3/config/jskult/task_settings/batch_laundering_task_settings.env @@ -1,4 +1,4 @@ -# jskult batch lanudering task environment file. +# jskult batch laundering task environment file. LOG_LEVEL=DEBUG SALES_LAUNDERING_EXTRACT_DATE_PERIOD=7 SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau_all From ae27ee5c815f6c3b5db5f9772edd46730ee64cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 18:49:07 +0900 Subject: [PATCH 60/69] =?UTF-8?q?=E7=9C=8B=E8=AD=B7=E7=A8=AE=E5=88=A5?= =?UTF-8?q?=E3=80=80=E6=96=B0=E8=A6=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_nurse_assrt_mapper.py | 98 +++++++++ .../utmp_tables/tables/com_nurse_assrt.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../table_mapper/com_nurse_assrt/__init__.py | 0 .../com_nurse_assrt_delete.csv | 7 + .../com_nurse_assrt_insert.csv | 7 + .../com_nurse_assrt_update.csv | 6 + .../db_com_nurse_assrt_before_delete.csv | 7 + .../db_com_nurse_assrt_before_update.csv | 7 + .../expect_com_nurse_assrt_delete.csv | 8 + .../expect_com_nurse_assrt_insert.csv | 8 + .../expect_com_nurse_assrt_update.csv | 7 + .../test_com_nurse_assrt_mapper.py | 197 ++++++++++++++++++ 13 files changed, 368 insertions(+), 2 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_nurse_assrt.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py new file mode 100644 index 00000000..6d1086f0 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py @@ -0,0 +1,98 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_nurse_assrt import ComNurseAssrt + + +class ComNurseAssrtMapper(UltmarcTableMapper): + """レイアウト区分023: COM_看護種別 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_nurse_assrt + WHERE + nurse_assrt_cd = :nurse_assrt_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_nurse_assrt + ( + nurse_assrt_cd, + nurse_assrt_name, + regist_ymd, + delete_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :nurse_assrt_cd, + :nurse_assrt_name, + :execute_date_str_ymd, + NULL, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + UPDATE_QUERY = """\ + UPDATE + src05.com_nurse_assrt + SET + nurse_assrt_name = :nurse_assrt_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + nurse_assrt_cd = :nurse_assrt_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_nurse_assrt + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + nurse_assrt_cd = :nurse_assrt_cd + """ + record: ComNurseAssrt + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComNurseAssrt) + program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + # モジュール名をクエリパラメータに設定 + self.query_parameter['program_name'] = program_name + # 読み込んだレコード値もクエリパラメータに追加 + self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + + def make_query(self): + # 修正区分がC(削除)の場合、論理削除 + if self.record.maint_flag == 'C': + self.queries.append(self.LOGICAL_DELETE_QUERY) + return + + # 追加、更新の場合 + self.queries.append(self.__make_upsert_query()) + return + + def __make_upsert_query(self): + # レコードの存在確認 + record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert + if record_count[0]['count_num'] == 0: + return self.INSERT_QUERY + + # 更新する項目が無い場合 + if self.record.nurse_assrt_name == '': + return None + else: + # 更新する項目がある場合はUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_nurse_assrt.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_nurse_assrt.py new file mode 100644 index 00000000..710b9a0a --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_nurse_assrt.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComNurseAssrt(UltmarcTable): + """レイアウト区分022: COM_看護種別""" + nurse_assrt_cd: str # 看護種別コード + nurse_assrt_name: str # 看護種別名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.nurse_assrt_cd = record[1] + self.nurse_assrt_name = record[5] + self.maint_flag = record[2] diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index ebea9e55..5896fc21 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,6 +1,6 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, null_mapper) + com_inst_mapper, com_nurse_assrt_mapper, null_mapper) from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -62,7 +62,7 @@ COM_TABLE_LIST = { # COM_先端医療機器 "022": null_mapper.NullMapper, # COM_看護種別 - "023": null_mapper.NullMapper, + "023": com_nurse_assrt_mapper.ComNurseAssrtMapper, # COM_医療機能評価 "024": null_mapper.NullMapper, # COM_地域クリティカルパス diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv new file mode 100644 index 00000000..9eafda82 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv @@ -0,0 +1,7 @@ +"023","3991","A","20141113","20141114","" +"023","4101","A","20141113","20141114","療養型介護療養施設サービス費(Ⅰ)" +"023","4102","A","20141113","20141114","療養型介護療養施設サービス費(Ⅱ)" +"023","4103","C","20141113","20141114","療養型介護療養施設サービス費(Ⅲ)" +"023","4104","A","20141113","20141114","療養型介護療養施設サービス費(Ⅳ)" +"023","4999","A","20141113","20141114","療養型介護療養施設サービス費種別不明" +"023","4105","A","20141113","20141114","療養型介護療養施設サービス費" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_insert.csv new file mode 100644 index 00000000..b12393f2 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_insert.csv @@ -0,0 +1,7 @@ +"023","3991","A","20141113","20141114","診療所療養型種別不明" +"023","4101","A","20141113","20141114","療養型介護療養施設サービス費(Ⅰ)" +"023","4102","A","20141113","20141114","療養型介護療養施設サービス費(Ⅱ)" +"023","4103","A","20141113","20141114","療養型介護療養施設サービス費(Ⅲ)" +"023","4104","A","20141113","20141114","療養型介護療養施設サービス費(Ⅳ)" +"023","4999","A","20141113","20141114","療養型介護療養施設サービス費種別不明" +"023","9999","A","20141113","20141114","ああああああああああいいいいいいいいいいううううううううううええええええええええおおおおおおか" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_update.csv new file mode 100644 index 00000000..2eac2208 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_update.csv @@ -0,0 +1,6 @@ +"023","3991","A","20141113","20141114","" +"023","4101","A","20141113","20141114","療養型介護療養施設サービス費(Ⅰ)" +"023","4102","A","20141113","20141114","療養型介護療養施設サービス費(Ⅱ)" +"023","4103","A","20141113","20141114","療養型介護療養施設サービス費(Ⅲ)" +"023","4104","A","20141113","20141114","療養型介護療養施設サービス費種別不明" +"023","4999","A","20141113","20141114","療養型介護療養施設サービス費(Ⅳ)" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_delete.csv new file mode 100644 index 00000000..de1019b7 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_delete.csv @@ -0,0 +1,7 @@ +"nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"4101","療養型介護療養施設サービス費(Ⅰ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4102","療養型介護療養施設サービス費(Ⅱ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4103","療養型介護療養施設サービス費(Ⅲ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4104","療養型介護療養施設サービス費(Ⅳ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4999","療養型介護療養施設サービス費種別不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_update.csv new file mode 100644 index 00000000..de1019b7 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/db_com_nurse_assrt_before_update.csv @@ -0,0 +1,7 @@ +"nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"4101","療養型介護療養施設サービス費(Ⅰ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4102","療養型介護療養施設サービス費(Ⅱ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4103","療養型介護療養施設サービス費(Ⅲ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4104","療養型介護療養施設サービス費(Ⅳ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" +"4999","療養型介護療養施設サービス費種別不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","clsComNurseAssrt" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv new file mode 100644 index 00000000..2c4cc78a --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv @@ -0,0 +1,8 @@ +"nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"4101","療養型介護療養施設サービス費(Ⅰ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" +"4102","療養型介護療養施設サービス費(Ⅱ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" +"4103","療養型介護療養施設サービス費(Ⅲ)","20171019","20171019","20230421","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" +"4104","療養型介護療養施設サービス費(Ⅳ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" +"4105","療養型介護療養施設サービス費","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:31:18","com_nurse_assrt_mapper","2017/10/19 10:31:18","com_nurse_assrt_mapper" +"4999","療養型介護療養施設サービス費種別不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_insert.csv new file mode 100644 index 00000000..564adfff --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_insert.csv @@ -0,0 +1,8 @@ +"nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"3991","診療所療養型種別不明","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"4101","療養型介護療養施設サービス費(Ⅰ)","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"4102","療養型介護療養施設サービス費(Ⅱ)","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"4103","療養型介護療養施設サービス費(Ⅲ)","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"4104","療養型介護療養施設サービス費(Ⅳ)","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"4999","療養型介護療養施設サービス費種別不明","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" +"9999","ああああああああああいいいいいいいいいいううううううううううええええええええええおおおおおおか","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:01:14","com_nurse_assrt_mapper","2017/10/19 10:01:14","com_nurse_assrt_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv new file mode 100644 index 00000000..664f4879 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv @@ -0,0 +1,7 @@ +"nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"4101","療養型介護療養施設サービス費(Ⅰ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" +"4102","療養型介護療養施設サービス費(Ⅱ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" +"4103","療養型介護療養施設サービス費(Ⅲ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" +"4104","療養型介護療養施設サービス費種別不明","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" +"4999","療養型介護療養施設サービス費(Ⅳ)","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py new file mode 100644 index 00000000..8794677f --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py @@ -0,0 +1,197 @@ +import os.path as path +from datetime import datetime + +import pytest + +from src.batch.common.batch_context import BatchContext +from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_nurse_assrt_mapper +from src.db.database import Database +from tests.testing_utility import (assert_table_results, + create_db_data_from_csv, + create_delete_sql_with_parameter, + create_insert_sql_with_parameter, + create_ultmarc_table_mapper_sut, + create_ultmarc_test_data_from_csv) + + +class TestComNurseAssrtMapper: + """レイアウト区分004: COM_出身校""" + + db: Database + batch_context: BatchContext + test_file_path: str = path.dirname(__file__) + + @pytest.fixture(autouse=True, scope='function') + def pre_test(self, database: Database): + """テスト実行前後処理""" + self.batch_context = BatchContext.get_instance() + # setup + self.db = database + self.db.connect() + self.db.begin() + + # testing + yield + + # teardown + self.db.rollback() + self.db.disconnect() + + def test_insert_record(self): + """ + Cases: + COM_出身校テーブルにレコードを登録する + Arranges: + - CSVデータを用意し、読み込む + - 追加対象となるレコードを削除する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_nurse_assrt_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_nurse_assrt', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_nurse_assrt_mapper.ComNurseAssrtMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_nurse_assrt_mapper.ComNurseAssrtMapper, f'{line_number}行目:マッパークラスが期通りか' + + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_nurse_assrt_insert.csv')) + primary_keys = [f"'{primary_key['nurse_assrt_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_nurse_assrt WHERE nurse_assrt_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_update_record(self): + """ + Cases: + COM_出身校テーブルのレコードを更新する + Arranges: + - CSVデータを用意し、読み込む + - 更新対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_nurse_assrt_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_nurse_assrt', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_nurse_assrt_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_nurse_assrt', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_nurse_assrt_mapper.ComNurseAssrtMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_nurse_assrt_mapper.ComNurseAssrtMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_nurse_assrt_update.csv')) + primary_keys = [f"'{primary_key['nurse_assrt_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_nurse_assrt WHERE nurse_assrt_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_logical_delete(self): + """ + Cases: + COM_出身校テーブルのレコードを1件論理削除する + Arranges: + - CSVデータを用意し、読み込む + - 削除対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_nurse_assrt_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_nurse_assrt', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_nurse_assrt_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_nurse_assrt', + test_data.keys(), + test_data.values() + ) + self.db.execute(insert_sql, insert_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_nurse_assrt_mapper.ComNurseAssrtMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_nurse_assrt_mapper.ComNurseAssrtMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_nurse_assrt_delete.csv')) + primary_keys = [f"'{primary_key['nurse_assrt_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_nurse_assrt WHERE nurse_assrt_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' From 4f48c40566120c2614c2f87762194e54597d8943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 24 Apr 2023 09:27:08 +0900 Subject: [PATCH 61/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_pharm/com_pharm_insert.csv | 163 ++++++++++++----- .../com_pharm/expect_com_pharm_insert.csv | 164 +++++++++++++----- 2 files changed, 236 insertions(+), 91 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv index 1eb9a6de..cd75c6c1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_insert.csv @@ -1,46 +1,119 @@ "102","12","345678","3","A","200501","200601","7","8","123","456","78901","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオ","6","17","189","19","2099","221-0001","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","1.23457E+12","25","26","27","28","29","30","31","32","3","0120-1234-12345","353","22","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","9","204001","1","204201","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","12","3456","78901" -"102","3","3673000",,"A","20121127","20121128",,,,,,"正式店舗名03","セイシキテンポメイ03","略式03","リヤクシキ03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","2-45-1-03","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673001",,"A","20121128","20121129",,,,,,"正式店舗名03A01a","セイシキテンポメイ03A01A","略式03A01a","リヤクシキ03A01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","2-45-1-03A01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673002",,"A","20121127","20121128",,,,,,"正式店舗名03A01b-01","セイシキテンポメイ03A01B-01","略式03A01b-01","リヤクシキ03A01B-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673003",,"A","20121128","20121129",,,,,,"正式店舗名03A01b-02","セイシキテンポメイ03A01B-02","略式03A01b-02","リヤクシキ03A01B-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673004",,"A","20121128","20121129",,,,,,"正式店舗名03A01c","セイシキテンポメイ03A01C","略式03A01c","リヤクシキ03A01C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","2-45-1-03A01C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, -"102","3","3673005",,"A","20121128","20121129","1",,,,,"正式店舗名03A01d","セイシキテンポメイ03A01D","略式03A01d","リヤクシキ03A01D",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","2-45-1-03A01D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673010",,"A","20121127","20121128",,"1",,,,"正式店舗名03A02a","セイシキテンポメイ03A02A","略式03A02a","リヤクシキ03A02A","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","2-45-1-03A02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673011",,"A","20121127","20121128","1",,,,,"正式店舗名03B01a","セイシキテンポメイ03B01A","略式03B01a","リヤクシキ03B01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","2-45-1-03B01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673012",,"A","20121127","20121128",,,,,,"正式店舗名03B02a","セイシキテンポメイ03B02A","略式03B02a","リヤクシキ03B02A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","2-45-1-03B02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673013",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02b","セイシキテンポメイ03B02B","略式03B02b","リヤクシキ03B02B","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","2-45-1-03B02B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673014",,"A","20121127","20121128",,,,,,"正式店舗名03B02c-01","セイシキテンポメイ03B02C-01","略式03B02c-01","リヤクシキ03B02C-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673015",,"A","20121128","20121129",,,,,,"正式店舗名03B02c-02","セイシキテンポメイ03B02C-02","略式03B02c-02","リヤクシキ03B02C-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673016",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-01","セイシキテンポメイ03B02D-01","略式03B02d-01","リヤクシキ03B02D-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673020",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-02","セイシキテンポメイ03B02D-02","略式03B02d-02","リヤクシキ03B02D-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673021",,"A","20121128","20121129",,,,,,"正式店舗名03B02d-03","セイシキテンポメイ03B02D-03","略式03B02d-03","リヤクシキ03B02D-03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673022",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02e","セイシキテンポメイ03B02E","略式03B02e","リヤクシキ03B02E","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02e","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","2-45-1-03B02E","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673023",,"A","20121127","20121128",,,,,,"正式店舗名03B03a全件","セイシキテンポメイ03B03Aゼンケン","略式03B03a全件","リヤクシキ03B03Aゼンケン",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","2-45-1-03B03A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673024",,"A","20121127","20121128",,,,,,"正式店舗名03B03b","セイシキテンポメイ03B03B","略式03B03b","リヤクシキ03B03B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","2-45-1-03B03B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673025",,"A","20121127","20121128",,,,,,"正式店舗名03B04a","セイシキテンポメイ03B04A","略式03B04a","リヤクシキ03B04A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","2-45-1-03B04A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673026",,"A","20121127","20121128",,,,,,"正式店舗名03B04b","セイシキテンポメイ03B04B","略式03B04b","リヤクシキ03B04B","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","2-45-1-03B04B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673030",,"A","20121127","20121128",,,,,,"正式店舗名03B04c","セイシキテンポメイ03B04C","略式03B04c","リヤクシキ03B04C","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","2-45-1-03B04C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673031",,"A","20121127","20121128",,,,,,"正式店舗名03B05a","セイシキテンポメイ03B05A","略式03B05a","リヤクシキ03B05A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","2-45-1-03B05A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673032",,"A","20121127","20121128",,,,,,"正式店舗名03B05b","セイシキテンポメイ03B05B","略式03B05b","リヤクシキ03B05B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","2-45-1-03B05B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673033",,"A","20121127","20121128",,,,,,"正式店舗名03B06a","セイシキテンポメイ03B06A","略式03B06a","リヤクシキ03B06A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","2-45-1-03B06A","3","3","5","2","7","7","12","2","1",,"471","85",,,,,,,,,,, -"102","3","3673034",,"A","20121127","20121128",,,,,,"正式店舗名03B06b","セイシキテンポメイ03B06B","略式03B06b","リヤクシキ03B06B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","2-45-1-03B06B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673035",,"A","20121127","20121128",,,,,,"正式店舗名03B06c","セイシキテンポメイ03B06C","略式03B06c","リヤクシキ03B06C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","2-45-1-03B06C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673036",,"A","20121127","20121128",,,,,,"正式店舗名03B07a","セイシキテンポメイ03B07A","略式03B07a","リヤクシキ03B07A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B07a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","2-45-1-03B07A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673040",,"A","20121127","20121128",,,,,,"正式店舗名03B08a","セイシキテンポメイ03B08A","略式03B08a","リヤクシキ03B08A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B08a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","2-45-1-03B08A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673041",,"A","20121127","20121128",,,,,,"正式店舗名03B09a","セイシキテンポメイ03B09A","略式03B09a","リヤクシキ03B09A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","2-45-1-03B09A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673042",,"A","20121127","20121128",,,,,,"正式店舗名03B09b","セイシキテンポメイ03B09B","略式03B09b","リヤクシキ03B09B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","2-45-1-03B09B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09b","ダイヒヨウシヤメイ 03B09B",,,,,,,,, -"102","3","3673043",,"A","20121127","20121128",,,,,,"正式店舗名03B09c","セイシキテンポメイ03B09C","略式03B09c","リヤクシキ03B09C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","2-45-1-03B09C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09c","ダイヒヨウシヤメイ 03B09C",,,,,,,,, -"102","3","3673044",,"A","20121127","20121128",,,,,,"正式店舗名03B10a","セイシキテンポメイ03B10A","略式03B10a","リヤクシキ03B10A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","2-45-1-03B10A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, -"102","3","3673045",,"A","20121127","20121128",,,,,,"正式店舗名03B10b","セイシキテンポメイ03B10B","略式03B10b","リヤクシキ03B10B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","2-45-1-03B10B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201210",,,,,,, -"102","3","3673046",,"A","20121127","20121128",,,,,,"正式店舗名03B11a","セイシキテンポメイ03B11A","略式03B11a","リヤクシキ03B11A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","2-45-1-03B11A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673047",,"A","20121127","20121128",,,,,,"正式店舗名03B11b","セイシキテンポメイ03B11B","略式03B11b","リヤクシキ03B11B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","2-45-1-03B11B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, -"102","3","3673048",,"A","20121127","20121128",,,,,,"正式店舗名03B11c","セイシキテンポメイ03B11C","略式03B11c","リヤクシキ03B11C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","2-45-1-03B11C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, -"102","3","3673051",,"A","20121127","20121128",,,,,,"正式店舗名03B12a","セイシキテンポメイ03B12A","略式03B12a","リヤクシキ03B12A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","2-45-1-03B12A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673052",,"A","20121127","20121128",,,,,,"正式店舗名03B12b","セイシキテンポメイ03B12B","略式03B12b","リヤクシキ03B12B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","2-45-1-03B12B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B",,, -"102","3","3673053",,"A","20121127","20121128",,,,,,"正式店舗名03B12c","セイシキテンポメイ03B12C","略式03B12c","リヤクシキ03B12C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","2-45-1-03B12C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C",,, -"102","3","3673054",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, -"102","3","3673055",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, -"102","3","3673056",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, -"102","3","3673060",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, -"102","3","3673061",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,"3","3673056", -"102","3","3673062",,"A","20121127","20121128",,,,,,"正式店舗名03B13c","セイシキテンポメイ03B13C","略式03B13c","リヤクシキ03B13C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","2-45-1-03B13C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","03","3673000",,"A","20121127","20121128",,,,,,"正式店舗名03","セイシキテンポメイ03","略式03","リヤクシキ03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","2-45-1-03","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673001",,"A","20121128","20121129",,,,,,"正式店舗名03A01a","セイシキテンポメイ03A01A","略式03A01a","リヤクシキ03A01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","2-45-1-03A01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673002",,"A","20121127","20121128",,,,,,"正式店舗名03A01b-01","セイシキテンポメイ03A01B-01","略式03A01b-01","リヤクシキ03A01B-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673003",,"A","20121128","20121129",,,,,,"正式店舗名03A01b-02","セイシキテンポメイ03A01B-02","略式03A01b-02","リヤクシキ03A01B-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","2-45-1-03A01B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673004",,"A","20121128","20121129",,,,,,"正式店舗名03A01c","セイシキテンポメイ03A01C","略式03A01c","リヤクシキ03A01C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","2-45-1-03A01C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, +"102","03","3673005",,"A","20121128","20121129","1",,,,,"正式店舗名03A01d","セイシキテンポメイ03A01D","略式03A01d","リヤクシキ03A01D",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A01d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","2-45-1-03A01D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673010",,"A","20121127","20121128",,"1",,,,"正式店舗名03A02a","セイシキテンポメイ03A02A","略式03A02a","リヤクシキ03A02A","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03A02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","2-45-1-03A02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673011",,"A","20121127","20121128","1",,,,,"正式店舗名03B01a","セイシキテンポメイ03B01A","略式03B01a","リヤクシキ03B01A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B01a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","2-45-1-03B01A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673012",,"A","20121127","20121128",,,,,,"正式店舗名03B02a","セイシキテンポメイ03B02A","略式03B02a","リヤクシキ03B02A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","2-45-1-03B02A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673013",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02b","セイシキテンポメイ03B02B","略式03B02b","リヤクシキ03B02B","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","2-45-1-03B02B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673014",,"A","20121127","20121128",,,,,,"正式店舗名03B02c-01","セイシキテンポメイ03B02C-01","略式03B02c-01","リヤクシキ03B02C-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673015",,"A","20121128","20121129",,,,,,"正式店舗名03B02c-02","セイシキテンポメイ03B02C-02","略式03B02c-02","リヤクシキ03B02C-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","2-45-1-03B02C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673016",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-01","セイシキテンポメイ03B02D-01","略式03B02d-01","リヤクシキ03B02D-01",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673020",,"A","20121127","20121128",,,,,,"正式店舗名03B02d-02","セイシキテンポメイ03B02D-02","略式03B02d-02","リヤクシキ03B02D-02",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673021",,"A","20121128","20121129",,,,,,"正式店舗名03B02d-03","セイシキテンポメイ03B02D-03","略式03B02d-03","リヤクシキ03B02D-03",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02d","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","2-45-1-03B02D","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673022",,"A","20121127","20121128",,"1",,,,"正式店舗名03B02e","セイシキテンポメイ03B02E","略式03B02e","リヤクシキ03B02E","6","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B02e","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","2-45-1-03B02E","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673023",,"A","20121127","20121128",,,,,,"正式店舗名03B03a全件","セイシキテンポメイ03B03Aゼンケン","略式03B03a全件","リヤクシキ03B03Aゼンケン",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","2-45-1-03B03A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673024",,"A","20121127","20121128",,,,,,"正式店舗名03B03b","セイシキテンポメイ03B03B","略式03B03b","リヤクシキ03B03B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B03b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","2-45-1-03B03B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673025",,"A","20121127","20121128",,,,,,"正式店舗名03B04a","セイシキテンポメイ03B04A","略式03B04a","リヤクシキ03B04A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","2-45-1-03B04A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673026",,"A","20121127","20121128",,,,,,"正式店舗名03B04b","セイシキテンポメイ03B04B","略式03B04b","リヤクシキ03B04B","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","2-45-1-03B04B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673030",,"A","20121127","20121128",,,,,,"正式店舗名03B04c","セイシキテンポメイ03B04C","略式03B04c","リヤクシキ03B04C","1","13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B04c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","2-45-1-03B04C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673031",,"A","20121127","20121128",,,,,,"正式店舗名03B05a","セイシキテンポメイ03B05A","略式03B05a","リヤクシキ03B05A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","2-45-1-03B05A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673032",,"A","20121127","20121128",,,,,,"正式店舗名03B05b","セイシキテンポメイ03B05B","略式03B05b","リヤクシキ03B05B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B05b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","2-45-1-03B05B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673033",,"A","20121127","20121128",,,,,,"正式店舗名03B06a","セイシキテンポメイ03B06A","略式03B06a","リヤクシキ03B06A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","2-45-1-03B06A","3","3","5","2","7","7","12","2","1",,"471","85",,,,,,,,,,, +"102","03","3673034",,"A","20121127","20121128",,,,,,"正式店舗名03B06b","セイシキテンポメイ03B06B","略式03B06b","リヤクシキ03B06B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","2-45-1-03B06B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673035",,"A","20121127","20121128",,,,,,"正式店舗名03B06c","セイシキテンポメイ03B06C","略式03B06c","リヤクシキ03B06C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B06c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","2-45-1-03B06C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673036",,"A","20121127","20121128",,,,,,"正式店舗名03B07a","セイシキテンポメイ03B07A","略式03B07a","リヤクシキ03B07A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B07a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","2-45-1-03B07A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673040",,"A","20121127","20121128",,,,,,"正式店舗名03B08a","セイシキテンポメイ03B08A","略式03B08a","リヤクシキ03B08A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B08a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","2-45-1-03B08A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673041",,"A","20121127","20121128",,,,,,"正式店舗名03B09a","セイシキテンポメイ03B09A","略式03B09a","リヤクシキ03B09A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","2-45-1-03B09A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673042",,"A","20121127","20121128",,,,,,"正式店舗名03B09b","セイシキテンポメイ03B09B","略式03B09b","リヤクシキ03B09B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","2-45-1-03B09B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09b","ダイヒヨウシヤメイ 03B09B",,,,,,,,, +"102","03","3673043",,"A","20121127","20121128",,,,,,"正式店舗名03B09c","セイシキテンポメイ03B09C","略式03B09c","リヤクシキ03B09C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B09c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","2-45-1-03B09C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","代表者名 03B09c","ダイヒヨウシヤメイ 03B09C",,,,,,,,, +"102","03","3673044",,"A","20121127","20121128",,,,,,"正式店舗名03B10a","セイシキテンポメイ03B10A","略式03B10a","リヤクシキ03B10A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","2-45-1-03B10A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201212",,,,,,, +"102","03","3673045",,"A","20121127","20121128",,,,,,"正式店舗名03B10b","セイシキテンポメイ03B10B","略式03B10b","リヤクシキ03B10B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B10b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","2-45-1-03B10B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,"1","201210",,,,,,, +"102","03","3673046",,"A","20121127","20121128",,,,,,"正式店舗名03B11a","セイシキテンポメイ03B11A","略式03B11a","リヤクシキ03B11A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","2-45-1-03B11A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673047",,"A","20121127","20121128",,,,,,"正式店舗名03B11b","セイシキテンポメイ03B11B","略式03B11b","リヤクシキ03B11B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","2-45-1-03B11B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, +"102","03","3673048",,"A","20121127","20121128",,,,,,"正式店舗名03B11c","セイシキテンポメイ03B11C","略式03B11c","リヤクシキ03B11C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B11c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","2-45-1-03B11C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,"1","201210",,,,, +"102","03","3673051",,"A","20121127","20121128",,,,,,"正式店舗名03B12a","セイシキテンポメイ03B12A","略式03B12a","リヤクシキ03B12A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","2-45-1-03B12A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673052",,"A","20121127","20121128",,,,,,"正式店舗名03B12b","セイシキテンポメイ03B12B","略式03B12b","リヤクシキ03B12B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","2-45-1-03B12B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B",,, +"102","03","3673053",,"A","20121127","20121128",,,,,,"正式店舗名03B12c","セイシキテンポメイ03B12C","略式03B12c","リヤクシキ03B12C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B12c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","2-45-1-03B12C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,"管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C",,, +"102","03","3673054",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","03","3673055",,"A","20121127","20121128",,,,,,"正式店舗名03B13a","セイシキテンポメイ03B13A","略式03B13a","リヤクシキ03B13A",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13a","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","2-45-1-03B13A","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,,, +"102","03","3673056",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","03","3673060",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","03","3673061",,"A","20121127","20121128",,,,,,"正式店舗名03B13b","セイシキテンポメイ03B13B","略式03B13b","リヤクシキ03B13B",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13b","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","2-45-1-03B13B","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,"3","3673056", +"102","03","3673062",,"A","20121127","20121128",,,,,,"正式店舗名03B13c","セイシキテンポメイ03B13C","略式03B13c","リヤクシキ03B13C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","2-45-1-03B13C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","89",,,,,,,,,,, +"102","03","3673063",,"A","20121127","20121128",,,,,,"正式店舗名03B13c","セイシキテンポメイ03B13C","略式03B13c","リヤクシキ03B13C",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 03B13c","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","2-45-1-03B13C","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85",,,,,,,,,"3","3673062", +"102","03","3673801",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ1","□","リヤクシキモジ1",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ1","2-45-1-1","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ1 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ1 タロウ",,, +"102","03","3673802",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ2","□","リヤクシキモジ2",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ2","2-45-1-2","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ2 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ2 タロウ",,, +"102","03","3673803",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ3","□","リヤクシキモジ3",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ3","2-45-1-3","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ3 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ3 タロウ",,, +"102","03","3673804",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ4","","リヤクシキモジ4",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ4","2-45-1-4","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ4 タロウ",,,,," 太郎","カンリヤクザイシメイモジ4 タロウ",,, +"102","03","3673805",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ5","","リヤクシキモジ5",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ5","2-45-1-5","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ5 タロウ",,,,," 太郎","カンリヤクザイシメイモジ5 タロウ",,, +"102","03","3673806",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ6","","リヤクシキモジ6",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ6","2-45-1-6","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ6 タロウ",,,,," 太郎","カンリヤクザイシメイモジ6 タロウ",,, +"102","03","3673807",,"A","20121127","20121128",,,,,,"□□□□□","セイシキテンポメイモジ7","□□□□□","リヤクシキモジ7",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ7","2-45-1-7","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□ 太郎","ダイヒヨウシヤメイモジ7 タロウ",,,,,"□□□□□ 太郎","カンリヤクザイシメイモジ7 タロウ",,, +"102","03","3673808",,"A","20121127","20121128",,,,,,"□□□□□","セイシキテンポメイモジ8","□□□□□","リヤクシキモジ8",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ8","2-45-1-8","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□ 太郎","ダイヒヨウシヤメイモジ8 タロウ",,,,,"□□□□□ 太郎","カンリヤクザイシメイモジ8 タロウ",,, +"102","03","3673809",,"A","20121127","20121128",,,,,,"□□□□□□□□","セイシキテンポメイモジ9","□□□□□□□□","リヤクシキモジ9",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ9","2-45-1-9","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ9 タロウ",,,,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ9 タロウ",,, +"102","03","3673810",,"A","20121127","20121128",,,,,,"□□□□□□□□","セイシキテンポメイモジ10","□□□□□□□□","リヤクシキモジ10",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ10","2-45-1-10","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ10 タロウ",,,,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ10 タロウ",,, +"102","03","3673811",,"A","20121127","20121128",,,,,,"□□□□□□","セイシキテンポメイモジ11","□□□□□□","リヤクシキモジ11",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ11","2-45-1-11","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□ 太郎","ダイヒヨウシヤメイモジ11 タロウ",,,,,"□□□□□□ 太郎","カンリヤクザイシメイモジ11 タロウ",,, +"102","03","3673812",,"A","20121127","20121128",,,,,,"□□□□□□□","セイシキテンポメイモジ12","□□□□□□□","リヤクシキモジ12",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ12","2-45-1-12","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□ 太郎","ダイヒヨウシヤメイモジ12 タロウ",,,,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ12 タロウ",,, +"102","03","3673813",,"A","20121127","20121128",,,,,,"□□□□□□□□","セイシキテンポメイモジ13","□□□□□□□□","リヤクシキモジ13",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ13","2-45-1-13","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ13 タロウ",,,,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ13 タロウ",,, +"102","03","3673814",,"A","20121127","20121128",,,,,,"□□□□□□□□","セイシキテンポメイモジ14","□□□□□□□□","リヤクシキモジ14",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ14","2-45-1-14","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ14 タロウ",,,,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ14 タロウ",,, +"102","03","3673815",,"A","20121127","20121128",,,,,,"□□□□","セイシキテンポメイモジ15","□□□□","リヤクシキモジ15",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ15","2-45-1-15","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□ 太郎","ダイヒヨウシヤメイモジ15 タロウ",,,,,"□□□□ 太郎","カンリヤクザイシメイモジ15 タロウ",,, +"102","03","3673816",,"A","20121127","20121128",,,,,,"□□□□□□□","セイシキテンポメイモジ16","□□□□□□□","リヤクシキモジ16",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ16","2-45-1-16","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□ 太郎","ダイヒヨウシヤメイモジ16 タロウ",,,,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ16 タロウ",,, +"102","03","3673817",,"A","20121127","20121128",,,,,,"□□□□□□□","セイシキテンポメイモジ17","□□□□□□□","リヤクシキモジ17",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ17","2-45-1-17","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□ 太郎","ダイヒヨウシヤメイモジ17 タロウ",,,,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ17 タロウ",,, +"102","03","3673818",,"A","20121127","20121128",,,,,,"□□□□□□□","セイシキテンポメイモジ18","□□□□□□□","リヤクシキモジ18",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ18","2-45-1-18","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□ 太郎","ダイヒヨウシヤメイモジ18 タロウ",,,,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ18 タロウ",,, +"102","03","3673819",,"A","20121127","20121128",,,,,,"□□□□□□□□□□","セイシキテンポメイモジ19","□□□□□□□□□□","リヤクシキモジ19",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ19","2-45-1-19","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ19 タロウ",,,,,"□□□□□□□□□□ 太郎","カンリヤクザイシメイモジ19 タロウ",,, +"102","03","3673820",,"A","20121127","20121128",,,,,,"□□□□□□□□□□","セイシキテンポメイモジ20","□□□□□□□□□□","リヤクシキモジ20",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ20","2-45-1-20","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ20 タロウ",,,,,"□□□□□□□□□□ 太郎","カンリヤクザイシメイモジ20 タロウ",,, +"102","03","3673821",,"A","20121127","20121128",,,,,,"□□□□□□□□","セイシキテンポメイモジ21","□□□□□□□□","リヤクシキモジ21",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□□□□□□□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ21","2-45-1-21","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□□□□□□□ 太郎","ダイヒヨウシヤメイモジ21 タロウ",,,,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ21 タロウ",,, +"102","03","3673822",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ22","","リヤクシキモジ22",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ22","2-45-1-22","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ22 タロウ",,,,," 太郎","カンリヤクザイシメイモジ22 タロウ",,, +"102","03","3673823",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ23","","リヤクシキモジ23",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ23","2-45-1-23","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ23 タロウ",,,,," 太郎","カンリヤクザイシメイモジ23 タロウ",,, +"102","03","3673824",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ24","","リヤクシキモジ24",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ24","2-45-1-24","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ24 タロウ",,,,," 太郎","カンリヤクザイシメイモジ24 タロウ",,, +"102","03","3673825",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ25","","リヤクシキモジ25",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ25","2-45-1-25","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ25 タロウ",,,,," 太郎","カンリヤクザイシメイモジ25 タロウ",,, +"102","03","3673826",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ26","□","リヤクシキモジ26",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ26","2-45-1-26","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ26 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ26 タロウ",,, +"102","03","3673827",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ27","","リヤクシキモジ27",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ27","2-45-1-27","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ27 タロウ",,,,," 太郎","カンリヤクザイシメイモジ27 タロウ",,, +"102","03","3673828",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ28","","リヤクシキモジ28",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ28","2-45-1-28","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ28 タロウ",,,,," 太郎","カンリヤクザイシメイモジ28 タロウ",,, +"102","03","3673829",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ29","","リヤクシキモジ29",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ29","2-45-1-29","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ29 タロウ",,,,," 太郎","カンリヤクザイシメイモジ29 タロウ",,, +"102","03","3673830",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ30","□","リヤクシキモジ30",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ30","2-45-1-30","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ30 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ30 タロウ",,, +"102","03","3673831",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ31","","リヤクシキモジ31",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ31","2-45-1-31","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ31 タロウ",,,,," 太郎","カンリヤクザイシメイモジ31 タロウ",,, +"102","03","3673832",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ32","","リヤクシキモジ32",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ32","2-45-1-32","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ32 タロウ",,,,," 太郎","カンリヤクザイシメイモジ32 タロウ",,, +"102","03","3673833",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ33","","リヤクシキモジ33",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ33","2-45-1-33","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ33 タロウ",,,,," 太郎","カンリヤクザイシメイモジ33 タロウ",,, +"102","03","3673834",,"A","20121127","20121128",,,,,,"□□","セイシキテンポメイモジ34","□□","リヤクシキモジ34",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ34","2-45-1-34","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□ 太郎","ダイヒヨウシヤメイモジ34 タロウ",,,,,"□□ 太郎","カンリヤクザイシメイモジ34 タロウ",,, +"102","03","3673835",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ35","","リヤクシキモジ35",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ35","2-45-1-35","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ35 タロウ",,,,," 太郎","カンリヤクザイシメイモジ35 タロウ",,, +"102","03","3673836",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ36","","リヤクシキモジ36",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ36","2-45-1-36","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ36 タロウ",,,,," 太郎","カンリヤクザイシメイモジ36 タロウ",,, +"102","03","3673837",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ37","","リヤクシキモジ37",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ37","2-45-1-37","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ37 タロウ",,,,," 太郎","カンリヤクザイシメイモジ37 タロウ",,, +"102","03","3673838",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ38","□","リヤクシキモジ38",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ38","2-45-1-38","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ38 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ38 タロウ",,, +"102","03","3673839",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ39","","リヤクシキモジ39",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ39","2-45-1-39","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ39 タロウ",,,,," 太郎","カンリヤクザイシメイモジ39 タロウ",,, +"102","03","3673840",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ40","","リヤクシキモジ40",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ40","2-45-1-40","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ40 タロウ",,,,," 太郎","カンリヤクザイシメイモジ40 タロウ",,, +"102","03","3673841",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ41","","リヤクシキモジ41",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ41","2-45-1-41","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ41 タロウ",,,,," 太郎","カンリヤクザイシメイモジ41 タロウ",,, +"102","03","3673842",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ42","","リヤクシキモジ42",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ42","2-45-1-42","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ42 タロウ",,,,," 太郎","カンリヤクザイシメイモジ42 タロウ",,, +"102","03","3673843",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ43","","リヤクシキモジ43",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ43","2-45-1-43","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ43 タロウ",,,,," 太郎","カンリヤクザイシメイモジ43 タロウ",,, +"102","03","3673844",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ44","","リヤクシキモジ44",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ44","2-45-1-44","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ44 タロウ",,,,," 太郎","カンリヤクザイシメイモジ44 タロウ",,, +"102","03","3673845",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ45","","リヤクシキモジ45",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ45","2-45-1-45","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ45 タロウ",,,,," 太郎","カンリヤクザイシメイモジ45 タロウ",,, +"102","03","3673846",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ46","","リヤクシキモジ46",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ46","2-45-1-46","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ46 タロウ",,,,," 太郎","カンリヤクザイシメイモジ46 タロウ",,, +"102","03","3673847",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ47","□","リヤクシキモジ47",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ47","2-45-1-47","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ47 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ47 タロウ",,, +"102","03","3673848",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ48","□","リヤクシキモジ48",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ48","2-45-1-48","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ48 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ48 タロウ",,, +"102","03","3673849",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ49","","リヤクシキモジ49",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ49","2-45-1-49","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ49 タロウ",,,,," 太郎","カンリヤクザイシメイモジ49 タロウ",,, +"102","03","3673850",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ50","□","リヤクシキモジ50",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ50","2-45-1-50","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ50 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ50 タロウ",,, +"102","03","3673851",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ51","","リヤクシキモジ51",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ51","2-45-1-51","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ51 タロウ",,,,," 太郎","カンリヤクザイシメイモジ51 タロウ",,, +"102","03","3673852",,"A","20121127","20121128",,,,,,"□","セイシキテンポメイモジ52","□","リヤクシキモジ52",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ52","2-45-1-52","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□ 太郎","ダイヒヨウシヤメイモジ52 タロウ",,,,,"□ 太郎","カンリヤクザイシメイモジ52 タロウ",,, +"102","03","3673853",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ53","","リヤクシキモジ53",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ53","2-45-1-53","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ53 タロウ",,,,," 太郎","カンリヤクザイシメイモジ53 タロウ",,, +"102","03","3673854",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ54","","リヤクシキモジ54",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ54","2-45-1-54","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ54 タロウ",,,,," 太郎","カンリヤクザイシメイモジ54 タロウ",,, +"102","03","3673855",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ55","","リヤクシキモジ55",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ55","2-45-1-55","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ55 タロウ",,,,," 太郎","カンリヤクザイシメイモジ55 タロウ",,, +"102","03","3673856",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ56","","リヤクシキモジ56",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ56","2-45-1-56","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ56 タロウ",,,,," 太郎","カンリヤクザイシメイモジ56 タロウ",,, +"102","03","3673857",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ57","","リヤクシキモジ57",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ57","2-45-1-57","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ57 タロウ",,,,," 太郎","カンリヤクザイシメイモジ57 タロウ",,, +"102","03","3673858",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ58","","リヤクシキモジ58",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ58","2-45-1-58","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ58 タロウ",,,,," 太郎","カンリヤクザイシメイモジ58 タロウ",,, +"102","03","3673859",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ59","","リヤクシキモジ59",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ59","2-45-1-59","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ59 タロウ",,,,," 太郎","カンリヤクザイシメイモジ59 タロウ",,, +"102","03","3673860",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ60","","リヤクシキモジ60",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ60","2-45-1-60","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ60 タロウ",,,,," 太郎","カンリヤクザイシメイモジ60 タロウ",,, +"102","03","3673861",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ61","","リヤクシキモジ61",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ61","2-45-1-61","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ61 タロウ",,,,," 太郎","カンリヤクザイシメイモジ61 タロウ",,, +"102","03","3673862",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ62","","リヤクシキモジ62",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ62","2-45-1-62","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ62 タロウ",,,,," 太郎","カンリヤクザイシメイモジ62 タロウ",,, +"102","03","3673863",,"A","20121127","20121128",,,,,,"","セイシキテンポメイモジ63","","リヤクシキモジ63",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ63","2-45-1-63","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85"," 太郎","ダイヒヨウシヤメイモジ63 タロウ",,,,," 太郎","カンリヤクザイシメイモジ63 タロウ",,, +"102","03","3673864",,"A","20121127","20121128",,,,,,"□□","セイシキテンポメイモジ64","□□","リヤクシキモジ64",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ64","2-45-1-64","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□ 太郎","ダイヒヨウシヤメイモジ64 タロウ",,,,,"□□ 太郎","カンリヤクザイシメイモジ64 タロウ",,, +"102","03","3673865",,"A","20121127","20121128",,,,,,"□□","セイシキテンポメイモジ65","□□","リヤクシキモジ65",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 □□","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ65","2-45-1-65","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","□□ 太郎","ダイヒヨウシヤメイモジ65 タロウ",,,,,"□□ 太郎","カンリヤクザイシメイモジ65 タロウ",,, +"102","03","3673866",,"A","20121127","20121128",,,,,,"鯵鰺鴬鶯蛎蠣撹攪竃竈","セイシキテンポメイモジ66","鯵鰺鴬鶯蛎蠣撹攪竃竈","リヤクシキモジ66",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 鯵鰺鴬鶯蛎蠣撹攪竃竈","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ66","2-45-1-66","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","鯵鰺鴬鶯蛎蠣撹攪竃竈 太郎","ダイヒヨウシヤメイモジ66 タロウ",,,,,"鯵鰺鴬鶯蛎蠣撹攪竃竈 太郎","カンリヤクザイシメイモジ66 タロウ",,, +"102","03","3673867",,"A","20121127","20121128",,,,,,"潅灌諌諫頚頸砿礦蕊蘂","セイシキテンポメイモジ67","潅灌諌諫頚頸砿礦蕊蘂","リヤクシキモジ67",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 潅灌諌諫頚頸砿礦蕊蘂","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ67","2-45-1-67","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","潅灌諌諫頚頸砿礦蕊蘂 太郎","ダイヒヨウシヤメイモジ67 タロウ",,,,,"潅灌諌諫頚頸砿礦蕊蘂 太郎","カンリヤクザイシメイモジ67 タロウ",,, +"102","03","3673868",,"A","20121127","20121128",,,,,,"靭靱賎賤壷壺砺礪梼檮","セイシキテンポメイモジ68","靭靱賎賤壷壺砺礪梼檮","リヤクシキモジ68",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 靭靱賎賤壷壺砺礪梼檮","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ68","2-45-1-68","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","靭靱賎賤壷壺砺礪梼檮 太郎","ダイヒヨウシヤメイモジ68 タロウ",,,,,"靭靱賎賤壷壺砺礪梼檮 太郎","カンリヤクザイシメイモジ68 タロウ",,, +"102","03","3673869",,"A","20121127","20121128",,,,,,"涛濤迩邇蝿蠅桧檜侭儘","セイシキテンポメイモジ69","涛濤迩邇蝿蠅桧檜侭儘","リヤクシキモジ69",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 涛濤迩邇蝿蠅桧檜侭儘","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ69","2-45-1-69","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","涛濤迩邇蝿蠅桧檜侭儘 太郎","ダイヒヨウシヤメイモジ69 タロウ",,,,,"涛濤迩邇蝿蠅桧檜侭儘 太郎","カンリヤクザイシメイモジ69 タロウ",,, +"102","03","3673870",,"A","20121127","20121128",,,,,,"薮藪篭籠","セイシキテンポメイモジ70","薮藪篭籠","リヤクシキモジ70",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 薮藪篭籠","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ70","2-45-1-70","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","薮藪篭籠 太郎","ダイヒヨウシヤメイモジ70 タロウ",,,,,"薮藪篭籠 太郎","カンリヤクザイシメイモジ70 タロウ",,, +"102","03","3673871",,"A","20121127","20121128",,,,,,"尭堯槙槇遥遙瑶瑤凜熙","セイシキテンポメイモジ71","尭堯槙槇遥遙瑶瑤凜熙","リヤクシキモジ71",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 尭堯槙槇遥遙瑶瑤凜熙","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ71","2-45-1-71","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","尭堯槙槇遥遙瑶瑤凜熙 太郎","ダイヒヨウシヤメイモジ71 タロウ",,,,,"尭堯槙槇遥遙瑶瑤凜熙 太郎","カンリヤクザイシメイモジ71 タロウ",,, +"102","03","3673872",,"A","20121127","20121128",,,,,,"ツッー-一医院薬鈴田","セイシキテンポメイモジ72","ツッー-一医院薬鈴田","リヤクシキモジ72",,"13","102","24","2","103-0007","東京都中央区日本橋浜町2-45-1 ツッー-一医院薬鈴田","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ72","2-45-1-72","3","3","5","2","7","7","12","2",,"03-3249-8231","471","85","ツッー-一医院薬鈴田 太郎","ダイヒヨウシヤメイモジ72 タロウ",,,,,"ツッー-一医院薬鈴田 太郎","カンリヤクザイシメイモジ72 タロウ",,, diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv index 7c0b01c6..c8e1a6bc 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_insert.csv @@ -1,47 +1,119 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"123456783","22","6","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","アイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","亜居宇絵尾亜居宇絵尾亜居宇絵尾","1","9","204201","204001","アイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","3","7","0120-1234-12345","アイウエオアイウエオアイウエオアイウエオアイウエオアイウエオ","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","221-0001","17189192099","17","189","1.23457E+12","29303132","25262728","353","8","12345678901","亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾","アイウエオアイウエオ","12345678901","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673000","85","","セイシキテンポメイ03","リヤクシキ03","正式店舗名03","略式03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","東京都中央区日本橋浜町2-45-1 03","103-0007","13102242","13","102","2-45-1-03","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673001","85","","セイシキテンポメイ03A01A","リヤクシキ03A01A","正式店舗名03A01a","略式03A01a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","東京都中央区日本橋浜町2-45-1 03A01a","103-0007","13102242","13","102","2-45-1-03A01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673002","85","","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673003","85","","セイシキテンポメイ03A01B-02","リヤクシキ03A01B-02","正式店舗名03A01b-02","略式03A01b-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673004","85","","セイシキテンポメイ03A01C","リヤクシキ03A01C","正式店舗名03A01c","略式03A01c","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","東京都中央区日本橋浜町2-45-1 03A01c","103-0007","13102242","13","102","2-45-1-03A01C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673005","85","","セイシキテンポメイ03A01D","リヤクシキ03A01D","正式店舗名03A01d","略式03A01d","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","東京都中央区日本橋浜町2-45-1 03A01d","103-0007","13102242","13","102","2-45-1-03A01D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673011","85","","セイシキテンポメイ03B01A","リヤクシキ03B01A","正式店舗名03B01a","略式03B01a","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","東京都中央区日本橋浜町2-45-1 03B01a","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673012","85","","セイシキテンポメイ03B02A","リヤクシキ03B02A","正式店舗名03B02a","略式03B02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","東京都中央区日本橋浜町2-45-1 03B02a","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673013","85","6","セイシキテンポメイ03B02B","リヤクシキ03B02B","正式店舗名03B02b","略式03B02b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","東京都中央区日本橋浜町2-45-1 03B02b","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673014","85","","セイシキテンポメイ03B02C-01","リヤクシキ03B02C-01","正式店舗名03B02c-01","略式03B02c-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673015","85","","セイシキテンポメイ03B02C-02","リヤクシキ03B02C-02","正式店舗名03B02c-02","略式03B02c-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673016","85","","セイシキテンポメイ03B02D-01","リヤクシキ03B02D-01","正式店舗名03B02d-01","略式03B02d-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673020","85","","セイシキテンポメイ03B02D-02","リヤクシキ03B02D-02","正式店舗名03B02d-02","略式03B02d-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673021","85","","セイシキテンポメイ03B02D-03","リヤクシキ03B02D-03","正式店舗名03B02d-03","略式03B02d-03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673022","85","6","セイシキテンポメイ03B02E","リヤクシキ03B02E","正式店舗名03B02e","略式03B02e","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","東京都中央区日本橋浜町2-45-1 03B02e","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673023","85","","セイシキテンポメイ03B03Aゼンケン","リヤクシキ03B03Aゼンケン","正式店舗名03B03a全件","略式03B03a全件","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","東京都中央区日本橋浜町2-45-1 03B03a","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673024","85","","セイシキテンポメイ03B03B","リヤクシキ03B03B","正式店舗名03B03b","略式03B03b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","東京都中央区日本橋浜町2-45-1 03B03b","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673025","85","","セイシキテンポメイ03B04A","リヤクシキ03B04A","正式店舗名03B04a","略式03B04a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","東京都中央区日本橋浜町2-45-1 03B04a","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673026","85","1","セイシキテンポメイ03B04B","リヤクシキ03B04B","正式店舗名03B04b","略式03B04b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","東京都中央区日本橋浜町2-45-1 03B04b","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673030","85","1","セイシキテンポメイ03B04C","リヤクシキ03B04C","正式店舗名03B04c","略式03B04c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","東京都中央区日本橋浜町2-45-1 03B04c","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673031","85","","セイシキテンポメイ03B05A","リヤクシキ03B05A","正式店舗名03B05a","略式03B05a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","東京都中央区日本橋浜町2-45-1 03B05a","103-0007","13102242","13","102","2-45-1-03B05A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673032","85","","セイシキテンポメイ03B05B","リヤクシキ03B05B","正式店舗名03B05b","略式03B05b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","東京都中央区日本橋浜町2-45-1 03B05b","103-0007","13102242","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673033","85","","セイシキテンポメイ03B06A","リヤクシキ03B06A","正式店舗名03B06a","略式03B06a","","","","","","","1","","","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","東京都中央区日本橋浜町2-45-1 03B06a","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673034","85","","セイシキテンポメイ03B06B","リヤクシキ03B06B","正式店舗名03B06b","略式03B06b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","東京都中央区日本橋浜町2-45-1 03B06b","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673035","85","","セイシキテンポメイ03B06C","リヤクシキ03B06C","正式店舗名03B06c","略式03B06c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","東京都中央区日本橋浜町2-45-1 03B06c","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673036","85","","セイシキテンポメイ03B07A","リヤクシキ03B07A","正式店舗名03B07a","略式03B07a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","東京都中央区日本橋浜町2-45-1 03B07a","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673040","85","","セイシキテンポメイ03B08A","リヤクシキ03B08A","正式店舗名03B08a","略式03B08a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","東京都中央区日本橋浜町2-45-1 03B08a","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673041","85","","セイシキテンポメイ03B09A","リヤクシキ03B09A","正式店舗名03B09a","略式03B09a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","東京都中央区日本橋浜町2-45-1 03B09a","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673042","85","","セイシキテンポメイ03B09B","リヤクシキ03B09B","正式店舗名03B09b","略式03B09b","","","","","ダイヒヨウシヤメイ 03B09B","代表者名 03B09b","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","東京都中央区日本橋浜町2-45-1 03B09b","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673043","85","","セイシキテンポメイ03B09C","リヤクシキ03B09C","正式店舗名03B09c","略式03B09c","","","","","ダイヒヨウシヤメイ 03B09C","代表者名 03B09c","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","東京都中央区日本橋浜町2-45-1 03B09c","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673044","85","","セイシキテンポメイ03B10A","リヤクシキ03B10A","正式店舗名03B10a","略式03B10a","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","東京都中央区日本橋浜町2-45-1 03B10a","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673045","85","","セイシキテンポメイ03B10B","リヤクシキ03B10B","正式店舗名03B10b","略式03B10b","","1","","201210","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","東京都中央区日本橋浜町2-45-1 03B10b","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673046","85","","セイシキテンポメイ03B11A","リヤクシキ03B11A","正式店舗名03B11a","略式03B11a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","東京都中央区日本橋浜町2-45-1 03B11a","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673047","85","","セイシキテンポメイ03B11B","リヤクシキ03B11B","正式店舗名03B11b","略式03B11b","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","東京都中央区日本橋浜町2-45-1 03B11b","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673048","85","","セイシキテンポメイ03B11C","リヤクシキ03B11C","正式店舗名03B11c","略式03B11c","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","東京都中央区日本橋浜町2-45-1 03B11c","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673051","85","","セイシキテンポメイ03B12A","リヤクシキ03B12A","正式店舗名03B12a","略式03B12a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","東京都中央区日本橋浜町2-45-1 03B12a","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673052","85","","セイシキテンポメイ03B12B","リヤクシキ03B12B","正式店舗名03B12b","略式03B12b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","東京都中央区日本橋浜町2-45-1 03B12b","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673053","85","","セイシキテンポメイ03B12C","リヤクシキ03B12C","正式店舗名03B12c","略式03B12c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","東京都中央区日本橋浜町2-45-1 03B12c","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673054","89","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673055","85","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673056","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673060","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673061","85","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","33673056","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"33673062","89","","セイシキテンポメイ03B13C","リヤクシキ03B13C","正式店舗名03B13c","略式03B13c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","東京都中央区日本橋浜町2-45-1 03B13c","103-0007","13102242","13","102","2-45-1-03B13C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673000","85","","セイシキテンポメイ03","リヤクシキ03","正式店舗名03","略式03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03","東京都中央区日本橋浜町2-45-1 03","103-0007","13102242","13","102","2-45-1-03","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673001","85","","セイシキテンポメイ03A01A","リヤクシキ03A01A","正式店舗名03A01a","略式03A01a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01A","東京都中央区日本橋浜町2-45-1 03A01a","103-0007","13102242","13","102","2-45-1-03A01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673002","85","","セイシキテンポメイ03A01B-01","リヤクシキ03A01B-01","正式店舗名03A01b-01","略式03A01b-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673003","85","","セイシキテンポメイ03A01B-02","リヤクシキ03A01B-02","正式店舗名03A01b-02","略式03A01b-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01B","東京都中央区日本橋浜町2-45-1 03A01b","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673004","85","","セイシキテンポメイ03A01C","リヤクシキ03A01C","正式店舗名03A01c","略式03A01c","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01C","東京都中央区日本橋浜町2-45-1 03A01c","103-0007","13102242","13","102","2-45-1-03A01C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673005","85","","セイシキテンポメイ03A01D","リヤクシキ03A01D","正式店舗名03A01d","略式03A01d","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A01D","東京都中央区日本橋浜町2-45-1 03A01d","103-0007","13102242","13","102","2-45-1-03A01D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85","","セイシキテンポメイ03B01A","リヤクシキ03B01A","正式店舗名03B01a","略式03B01a","","","","","","","","1","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B01A","東京都中央区日本橋浜町2-45-1 03B01a","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673012","85","","セイシキテンポメイ03B02A","リヤクシキ03B02A","正式店舗名03B02a","略式03B02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02A","東京都中央区日本橋浜町2-45-1 03B02a","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673013","85","6","セイシキテンポメイ03B02B","リヤクシキ03B02B","正式店舗名03B02b","略式03B02b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02B","東京都中央区日本橋浜町2-45-1 03B02b","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673014","85","","セイシキテンポメイ03B02C-01","リヤクシキ03B02C-01","正式店舗名03B02c-01","略式03B02c-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673015","85","","セイシキテンポメイ03B02C-02","リヤクシキ03B02C-02","正式店舗名03B02c-02","略式03B02c-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02C","東京都中央区日本橋浜町2-45-1 03B02c","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673016","85","","セイシキテンポメイ03B02D-01","リヤクシキ03B02D-01","正式店舗名03B02d-01","略式03B02d-01","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673020","85","","セイシキテンポメイ03B02D-02","リヤクシキ03B02D-02","正式店舗名03B02d-02","略式03B02d-02","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673021","85","","セイシキテンポメイ03B02D-03","リヤクシキ03B02D-03","正式店舗名03B02d-03","略式03B02d-03","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02D","東京都中央区日本橋浜町2-45-1 03B02d","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673022","85","6","セイシキテンポメイ03B02E","リヤクシキ03B02E","正式店舗名03B02e","略式03B02e","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B02E","東京都中央区日本橋浜町2-45-1 03B02e","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673023","85","","セイシキテンポメイ03B03Aゼンケン","リヤクシキ03B03Aゼンケン","正式店舗名03B03a全件","略式03B03a全件","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03A","東京都中央区日本橋浜町2-45-1 03B03a","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673024","85","","セイシキテンポメイ03B03B","リヤクシキ03B03B","正式店舗名03B03b","略式03B03b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B03B","東京都中央区日本橋浜町2-45-1 03B03b","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673025","85","","セイシキテンポメイ03B04A","リヤクシキ03B04A","正式店舗名03B04a","略式03B04a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04A","東京都中央区日本橋浜町2-45-1 03B04a","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673026","85","1","セイシキテンポメイ03B04B","リヤクシキ03B04B","正式店舗名03B04b","略式03B04b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04B","東京都中央区日本橋浜町2-45-1 03B04b","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673030","85","1","セイシキテンポメイ03B04C","リヤクシキ03B04C","正式店舗名03B04c","略式03B04c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B04C","東京都中央区日本橋浜町2-45-1 03B04c","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673031","85","","セイシキテンポメイ03B05A","リヤクシキ03B05A","正式店舗名03B05a","略式03B05a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05A","東京都中央区日本橋浜町2-45-1 03B05a","103-0007","13102242","13","102","2-45-1-03B05A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673032","85","","セイシキテンポメイ03B05B","リヤクシキ03B05B","正式店舗名03B05b","略式03B05b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B05B","東京都中央区日本橋浜町2-45-1 03B05b","103-0007","13102242","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673033","85","","セイシキテンポメイ03B06A","リヤクシキ03B06A","正式店舗名03B06a","略式03B06a","","","","","","","1","","","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06A","東京都中央区日本橋浜町2-45-1 03B06a","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673034","85","","セイシキテンポメイ03B06B","リヤクシキ03B06B","正式店舗名03B06b","略式03B06b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06B","東京都中央区日本橋浜町2-45-1 03B06b","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673035","85","","セイシキテンポメイ03B06C","リヤクシキ03B06C","正式店舗名03B06c","略式03B06c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B06C","東京都中央区日本橋浜町2-45-1 03B06c","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673036","85","","セイシキテンポメイ03B07A","リヤクシキ03B07A","正式店舗名03B07a","略式03B07a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B07A","東京都中央区日本橋浜町2-45-1 03B07a","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673040","85","","セイシキテンポメイ03B08A","リヤクシキ03B08A","正式店舗名03B08a","略式03B08a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B08A","東京都中央区日本橋浜町2-45-1 03B08a","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673041","85","","セイシキテンポメイ03B09A","リヤクシキ03B09A","正式店舗名03B09a","略式03B09a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09A","東京都中央区日本橋浜町2-45-1 03B09a","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673042","85","","セイシキテンポメイ03B09B","リヤクシキ03B09B","正式店舗名03B09b","略式03B09b","","","","","ダイヒヨウシヤメイ 03B09B","代表者名 03B09b","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09B","東京都中央区日本橋浜町2-45-1 03B09b","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673043","85","","セイシキテンポメイ03B09C","リヤクシキ03B09C","正式店舗名03B09c","略式03B09c","","","","","ダイヒヨウシヤメイ 03B09C","代表者名 03B09c","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B09C","東京都中央区日本橋浜町2-45-1 03B09c","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673044","85","","セイシキテンポメイ03B10A","リヤクシキ03B10A","正式店舗名03B10a","略式03B10a","","1","","201212","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10A","東京都中央区日本橋浜町2-45-1 03B10a","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673045","85","","セイシキテンポメイ03B10B","リヤクシキ03B10B","正式店舗名03B10b","略式03B10b","","1","","201210","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B10B","東京都中央区日本橋浜町2-45-1 03B10b","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673046","85","","セイシキテンポメイ03B11A","リヤクシキ03B11A","正式店舗名03B11a","略式03B11a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11A","東京都中央区日本橋浜町2-45-1 03B11a","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673047","85","","セイシキテンポメイ03B11B","リヤクシキ03B11B","正式店舗名03B11b","略式03B11b","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11B","東京都中央区日本橋浜町2-45-1 03B11b","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673048","85","","セイシキテンポメイ03B11C","リヤクシキ03B11C","正式店舗名03B11c","略式03B11c","1","","201210","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B11C","東京都中央区日本橋浜町2-45-1 03B11c","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673051","85","","セイシキテンポメイ03B12A","リヤクシキ03B12A","正式店舗名03B12a","略式03B12a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12A","東京都中央区日本橋浜町2-45-1 03B12a","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673052","85","","セイシキテンポメイ03B12B","リヤクシキ03B12B","正式店舗名03B12b","略式03B12b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12B","東京都中央区日本橋浜町2-45-1 03B12b","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名 03B12b","カンリヤクザイシメイ 03B12B","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673053","85","","セイシキテンポメイ03B12C","リヤクシキ03B12C","正式店舗名03B12c","略式03B12c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B12C","東京都中央区日本橋浜町2-45-1 03B12c","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","管理薬剤師名 03B12c","カンリヤクザイシメイ 03B12C","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673054","89","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673055","85","","セイシキテンポメイ03B13A","リヤクシキ03B13A","正式店舗名03B13a","略式03B13a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13A","東京都中央区日本橋浜町2-45-1 03B13a","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673056","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673060","89","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673061","85","","セイシキテンポメイ03B13B","リヤクシキ03B13B","正式店舗名03B13b","略式03B13b","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13B","東京都中央区日本橋浜町2-45-1 03B13b","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","33673056","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673062","89","","セイシキテンポメイ03B13C","リヤクシキ03B13C","正式店舗名03B13c","略式03B13c","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","東京都中央区日本橋浜町2-45-1 03B13c","103-0007","13102242","13","102","2-45-1-03B13C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673063","85",,"セイシキテンポメイ03B13C","リヤクシキ03B13C","正式店舗名03B13c","略式03B13c",,,,,,,,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03B13C","東京都中央区日本橋浜町2-45-1 03B13c","103-0007","13102242","13","102","2-45-1-03B13C","77122","3352","471",,,,,"33673062","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673801","85",,"セイシキテンポメイモジ1","リヤクシキモジ1","□","□",,,,,"ダイヒヨウシヤメイモジ1 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ1","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-1","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ1 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673802","85",,"セイシキテンポメイモジ2","リヤクシキモジ2","□","□",,,,,"ダイヒヨウシヤメイモジ2 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ2","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-2","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ2 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673803","85",,"セイシキテンポメイモジ3","リヤクシキモジ3","□","□",,,,,"ダイヒヨウシヤメイモジ3 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ3","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-3","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ3 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673804","85",,"セイシキテンポメイモジ4","リヤクシキモジ4","","",,,,,"ダイヒヨウシヤメイモジ4 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ4","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-4","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ4 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673805","85",,"セイシキテンポメイモジ5","リヤクシキモジ5","","",,,,,"ダイヒヨウシヤメイモジ5 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ5","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-5","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ5 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673806","85",,"セイシキテンポメイモジ6","リヤクシキモジ6","","",,,,,"ダイヒヨウシヤメイモジ6 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ6","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-6","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ6 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673807","85",,"セイシキテンポメイモジ7","リヤクシキモジ7","□□□□□","□□□□□",,,,,"ダイヒヨウシヤメイモジ7 タロウ","□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ7","東京都中央区日本橋浜町2-45-1 □□□□□","103-0007","13102242","13","102","2-45-1-7","77122","3352","471",,,"□□□□□ 太郎","カンリヤクザイシメイモジ7 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673808","85",,"セイシキテンポメイモジ8","リヤクシキモジ8","□□□□□","□□□□□",,,,,"ダイヒヨウシヤメイモジ8 タロウ","□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ8","東京都中央区日本橋浜町2-45-1 □□□□□","103-0007","13102242","13","102","2-45-1-8","77122","3352","471",,,"□□□□□ 太郎","カンリヤクザイシメイモジ8 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673809","85",,"セイシキテンポメイモジ9","リヤクシキモジ9","□□□□□□□□","□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ9 タロウ","□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ9","東京都中央区日本橋浜町2-45-1 □□□□□□□□","103-0007","13102242","13","102","2-45-1-9","77122","3352","471",,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ9 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673810","85",,"セイシキテンポメイモジ10","リヤクシキモジ10","□□□□□□□□","□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ10 タロウ","□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ10","東京都中央区日本橋浜町2-45-1 □□□□□□□□","103-0007","13102242","13","102","2-45-1-10","77122","3352","471",,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ10 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673811","85",,"セイシキテンポメイモジ11","リヤクシキモジ11","□□□□□□","□□□□□□",,,,,"ダイヒヨウシヤメイモジ11 タロウ","□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ11","東京都中央区日本橋浜町2-45-1 □□□□□□","103-0007","13102242","13","102","2-45-1-11","77122","3352","471",,,"□□□□□□ 太郎","カンリヤクザイシメイモジ11 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673812","85",,"セイシキテンポメイモジ12","リヤクシキモジ12","□□□□□□□","□□□□□□□",,,,,"ダイヒヨウシヤメイモジ12 タロウ","□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ12","東京都中央区日本橋浜町2-45-1 □□□□□□□","103-0007","13102242","13","102","2-45-1-12","77122","3352","471",,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ12 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673813","85",,"セイシキテンポメイモジ13","リヤクシキモジ13","□□□□□□□□","□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ13 タロウ","□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ13","東京都中央区日本橋浜町2-45-1 □□□□□□□□","103-0007","13102242","13","102","2-45-1-13","77122","3352","471",,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ13 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673814","85",,"セイシキテンポメイモジ14","リヤクシキモジ14","□□□□□□□□","□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ14 タロウ","□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ14","東京都中央区日本橋浜町2-45-1 □□□□□□□□","103-0007","13102242","13","102","2-45-1-14","77122","3352","471",,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ14 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673815","85",,"セイシキテンポメイモジ15","リヤクシキモジ15","□□□□","□□□□",,,,,"ダイヒヨウシヤメイモジ15 タロウ","□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ15","東京都中央区日本橋浜町2-45-1 □□□□","103-0007","13102242","13","102","2-45-1-15","77122","3352","471",,,"□□□□ 太郎","カンリヤクザイシメイモジ15 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673816","85",,"セイシキテンポメイモジ16","リヤクシキモジ16","□□□□□□□","□□□□□□□",,,,,"ダイヒヨウシヤメイモジ16 タロウ","□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ16","東京都中央区日本橋浜町2-45-1 □□□□□□□","103-0007","13102242","13","102","2-45-1-16","77122","3352","471",,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ16 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673817","85",,"セイシキテンポメイモジ17","リヤクシキモジ17","□□□□□□□","□□□□□□□",,,,,"ダイヒヨウシヤメイモジ17 タロウ","□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ17","東京都中央区日本橋浜町2-45-1 □□□□□□□","103-0007","13102242","13","102","2-45-1-17","77122","3352","471",,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ17 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673818","85",,"セイシキテンポメイモジ18","リヤクシキモジ18","□□□□□□□","□□□□□□□",,,,,"ダイヒヨウシヤメイモジ18 タロウ","□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ18","東京都中央区日本橋浜町2-45-1 □□□□□□□","103-0007","13102242","13","102","2-45-1-18","77122","3352","471",,,"□□□□□□□ 太郎","カンリヤクザイシメイモジ18 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673819","85",,"セイシキテンポメイモジ19","リヤクシキモジ19","□□□□□□□□□□","□□□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ19 タロウ","□□□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ19","東京都中央区日本橋浜町2-45-1 □□□□□□□□□□","103-0007","13102242","13","102","2-45-1-19","77122","3352","471",,,"□□□□□□□□□□ 太郎","カンリヤクザイシメイモジ19 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673820","85",,"セイシキテンポメイモジ20","リヤクシキモジ20","□□□□□□□□□□","□□□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ20 タロウ","□□□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ20","東京都中央区日本橋浜町2-45-1 □□□□□□□□□□","103-0007","13102242","13","102","2-45-1-20","77122","3352","471",,,"□□□□□□□□□□ 太郎","カンリヤクザイシメイモジ20 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673821","85",,"セイシキテンポメイモジ21","リヤクシキモジ21","□□□□□□□□","□□□□□□□□",,,,,"ダイヒヨウシヤメイモジ21 タロウ","□□□□□□□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ21","東京都中央区日本橋浜町2-45-1 □□□□□□□□","103-0007","13102242","13","102","2-45-1-21","77122","3352","471",,,"□□□□□□□□ 太郎","カンリヤクザイシメイモジ21 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673822","85",,"セイシキテンポメイモジ22","リヤクシキモジ22","","",,,,,"ダイヒヨウシヤメイモジ22 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ22","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-22","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ22 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673823","85",,"セイシキテンポメイモジ23","リヤクシキモジ23","","",,,,,"ダイヒヨウシヤメイモジ23 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ23","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-23","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ23 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673824","85",,"セイシキテンポメイモジ24","リヤクシキモジ24","","",,,,,"ダイヒヨウシヤメイモジ24 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ24","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-24","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ24 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673825","85",,"セイシキテンポメイモジ25","リヤクシキモジ25","","",,,,,"ダイヒヨウシヤメイモジ25 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ25","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-25","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ25 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673826","85",,"セイシキテンポメイモジ26","リヤクシキモジ26","□","□",,,,,"ダイヒヨウシヤメイモジ26 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ26","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-26","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ26 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673827","85",,"セイシキテンポメイモジ27","リヤクシキモジ27","","",,,,,"ダイヒヨウシヤメイモジ27 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ27","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-27","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ27 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673828","85",,"セイシキテンポメイモジ28","リヤクシキモジ28","","",,,,,"ダイヒヨウシヤメイモジ28 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ28","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-28","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ28 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673829","85",,"セイシキテンポメイモジ29","リヤクシキモジ29","","",,,,,"ダイヒヨウシヤメイモジ29 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ29","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-29","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ29 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673830","85",,"セイシキテンポメイモジ30","リヤクシキモジ30","□","□",,,,,"ダイヒヨウシヤメイモジ30 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ30","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-30","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ30 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673831","85",,"セイシキテンポメイモジ31","リヤクシキモジ31","","",,,,,"ダイヒヨウシヤメイモジ31 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ31","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-31","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ31 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673832","85",,"セイシキテンポメイモジ32","リヤクシキモジ32","","",,,,,"ダイヒヨウシヤメイモジ32 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ32","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-32","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ32 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673833","85",,"セイシキテンポメイモジ33","リヤクシキモジ33","","",,,,,"ダイヒヨウシヤメイモジ33 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ33","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-33","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ33 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673834","85",,"セイシキテンポメイモジ34","リヤクシキモジ34","□□","□□",,,,,"ダイヒヨウシヤメイモジ34 タロウ","□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ34","東京都中央区日本橋浜町2-45-1 □□","103-0007","13102242","13","102","2-45-1-34","77122","3352","471",,,"□□ 太郎","カンリヤクザイシメイモジ34 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673835","85",,"セイシキテンポメイモジ35","リヤクシキモジ35","","",,,,,"ダイヒヨウシヤメイモジ35 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ35","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-35","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ35 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673836","85",,"セイシキテンポメイモジ36","リヤクシキモジ36","","",,,,,"ダイヒヨウシヤメイモジ36 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ36","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-36","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ36 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673837","85",,"セイシキテンポメイモジ37","リヤクシキモジ37","","",,,,,"ダイヒヨウシヤメイモジ37 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ37","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-37","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ37 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673838","85",,"セイシキテンポメイモジ38","リヤクシキモジ38","□","□",,,,,"ダイヒヨウシヤメイモジ38 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ38","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-38","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ38 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673839","85",,"セイシキテンポメイモジ39","リヤクシキモジ39","","",,,,,"ダイヒヨウシヤメイモジ39 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ39","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-39","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ39 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673840","85",,"セイシキテンポメイモジ40","リヤクシキモジ40","","",,,,,"ダイヒヨウシヤメイモジ40 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ40","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-40","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ40 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673841","85",,"セイシキテンポメイモジ41","リヤクシキモジ41","","",,,,,"ダイヒヨウシヤメイモジ41 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ41","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-41","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ41 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673842","85",,"セイシキテンポメイモジ42","リヤクシキモジ42","","",,,,,"ダイヒヨウシヤメイモジ42 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ42","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-42","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ42 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673843","85",,"セイシキテンポメイモジ43","リヤクシキモジ43","","",,,,,"ダイヒヨウシヤメイモジ43 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ43","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-43","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ43 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673844","85",,"セイシキテンポメイモジ44","リヤクシキモジ44","","",,,,,"ダイヒヨウシヤメイモジ44 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ44","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-44","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ44 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673845","85",,"セイシキテンポメイモジ45","リヤクシキモジ45","","",,,,,"ダイヒヨウシヤメイモジ45 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ45","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-45","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ45 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673846","85",,"セイシキテンポメイモジ46","リヤクシキモジ46","","",,,,,"ダイヒヨウシヤメイモジ46 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ46","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-46","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ46 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673847","85",,"セイシキテンポメイモジ47","リヤクシキモジ47","□","□",,,,,"ダイヒヨウシヤメイモジ47 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ47","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-47","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ47 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673848","85",,"セイシキテンポメイモジ48","リヤクシキモジ48","□","□",,,,,"ダイヒヨウシヤメイモジ48 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ48","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-48","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ48 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673849","85",,"セイシキテンポメイモジ49","リヤクシキモジ49","","",,,,,"ダイヒヨウシヤメイモジ49 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ49","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-49","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ49 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673850","85",,"セイシキテンポメイモジ50","リヤクシキモジ50","□","□",,,,,"ダイヒヨウシヤメイモジ50 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ50","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-50","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ50 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673851","85",,"セイシキテンポメイモジ51","リヤクシキモジ51","","",,,,,"ダイヒヨウシヤメイモジ51 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ51","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-51","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ51 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673852","85",,"セイシキテンポメイモジ52","リヤクシキモジ52","□","□",,,,,"ダイヒヨウシヤメイモジ52 タロウ","□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ52","東京都中央区日本橋浜町2-45-1 □","103-0007","13102242","13","102","2-45-1-52","77122","3352","471",,,"□ 太郎","カンリヤクザイシメイモジ52 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673853","85",,"セイシキテンポメイモジ53","リヤクシキモジ53","","",,,,,"ダイヒヨウシヤメイモジ53 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ53","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-53","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ53 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673854","85",,"セイシキテンポメイモジ54","リヤクシキモジ54","","",,,,,"ダイヒヨウシヤメイモジ54 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ54","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-54","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ54 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673855","85",,"セイシキテンポメイモジ55","リヤクシキモジ55","","",,,,,"ダイヒヨウシヤメイモジ55 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ55","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-55","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ55 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673856","85",,"セイシキテンポメイモジ56","リヤクシキモジ56","","",,,,,"ダイヒヨウシヤメイモジ56 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ56","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-56","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ56 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673857","85",,"セイシキテンポメイモジ57","リヤクシキモジ57","","",,,,,"ダイヒヨウシヤメイモジ57 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ57","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-57","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ57 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673858","85",,"セイシキテンポメイモジ58","リヤクシキモジ58","","",,,,,"ダイヒヨウシヤメイモジ58 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ58","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-58","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ58 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673859","85",,"セイシキテンポメイモジ59","リヤクシキモジ59","","",,,,,"ダイヒヨウシヤメイモジ59 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ59","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-59","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ59 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673860","85",,"セイシキテンポメイモジ60","リヤクシキモジ60","","",,,,,"ダイヒヨウシヤメイモジ60 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ60","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-60","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ60 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673861","85",,"セイシキテンポメイモジ61","リヤクシキモジ61","","",,,,,"ダイヒヨウシヤメイモジ61 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ61","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-61","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ61 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673862","85",,"セイシキテンポメイモジ62","リヤクシキモジ62","","",,,,,"ダイヒヨウシヤメイモジ62 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ62","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-62","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ62 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673863","85",,"セイシキテンポメイモジ63","リヤクシキモジ63","","",,,,,"ダイヒヨウシヤメイモジ63 タロウ"," 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ63","東京都中央区日本橋浜町2-45-1 ","103-0007","13102242","13","102","2-45-1-63","77122","3352","471",,," 太郎","カンリヤクザイシメイモジ63 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673864","85",,"セイシキテンポメイモジ64","リヤクシキモジ64","□□","□□",,,,,"ダイヒヨウシヤメイモジ64 タロウ","□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ64","東京都中央区日本橋浜町2-45-1 □□","103-0007","13102242","13","102","2-45-1-64","77122","3352","471",,,"□□ 太郎","カンリヤクザイシメイモジ64 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673865","85",,"セイシキテンポメイモジ65","リヤクシキモジ65","□□","□□",,,,,"ダイヒヨウシヤメイモジ65 タロウ","□□ 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ65","東京都中央区日本橋浜町2-45-1 □□","103-0007","13102242","13","102","2-45-1-65","77122","3352","471",,,"□□ 太郎","カンリヤクザイシメイモジ65 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673866","85",,"セイシキテンポメイモジ66","リヤクシキモジ66","鯵鰺鴬鶯蛎蠣撹攪竃竈","鯵鰺鴬鶯蛎蠣撹攪竃竈",,,,,"ダイヒヨウシヤメイモジ66 タロウ","鯵鰺鴬鶯蛎蠣撹攪竃竈 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ66","東京都中央区日本橋浜町2-45-1 鯵鰺鴬鶯蛎蠣撹攪竃竈","103-0007","13102242","13","102","2-45-1-66","77122","3352","471",,,"鯵鰺鴬鶯蛎蠣撹攪竃竈 太郎","カンリヤクザイシメイモジ66 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673867","85",,"セイシキテンポメイモジ67","リヤクシキモジ67","潅灌諌諫頚頸砿礦蕊蘂","潅灌諌諫頚頸砿礦蕊蘂",,,,,"ダイヒヨウシヤメイモジ67 タロウ","潅灌諌諫頚頸砿礦蕊蘂 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ67","東京都中央区日本橋浜町2-45-1 潅灌諌諫頚頸砿礦蕊蘂","103-0007","13102242","13","102","2-45-1-67","77122","3352","471",,,"潅灌諌諫頚頸砿礦蕊蘂 太郎","カンリヤクザイシメイモジ67 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673868","85",,"セイシキテンポメイモジ68","リヤクシキモジ68","靭靱賎賤壷壺砺礪梼檮","靭靱賎賤壷壺砺礪梼檮",,,,,"ダイヒヨウシヤメイモジ68 タロウ","靭靱賎賤壷壺砺礪梼檮 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ68","東京都中央区日本橋浜町2-45-1 靭靱賎賤壷壺砺礪梼檮","103-0007","13102242","13","102","2-45-1-68","77122","3352","471",,,"靭靱賎賤壷壺砺礪梼檮 太郎","カンリヤクザイシメイモジ68 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673869","85",,"セイシキテンポメイモジ69","リヤクシキモジ69","涛濤迩邇蝿蠅桧檜侭儘","涛濤迩邇蝿蠅桧檜侭儘",,,,,"ダイヒヨウシヤメイモジ69 タロウ","涛濤迩邇蝿蠅桧檜侭儘 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ69","東京都中央区日本橋浜町2-45-1 涛濤迩邇蝿蠅桧檜侭儘","103-0007","13102242","13","102","2-45-1-69","77122","3352","471",,,"涛濤迩邇蝿蠅桧檜侭儘 太郎","カンリヤクザイシメイモジ69 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673870","85",,"セイシキテンポメイモジ70","リヤクシキモジ70","薮藪篭籠","薮藪篭籠",,,,,"ダイヒヨウシヤメイモジ70 タロウ","薮藪篭籠 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ70","東京都中央区日本橋浜町2-45-1 薮藪篭籠","103-0007","13102242","13","102","2-45-1-70","77122","3352","471",,,"薮藪篭籠 太郎","カンリヤクザイシメイモジ70 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673871","85",,"セイシキテンポメイモジ71","リヤクシキモジ71","尭堯槙槇遥遙瑶瑤凜熙","尭堯槙槇遥遙瑶瑤凜熙",,,,,"ダイヒヨウシヤメイモジ71 タロウ","尭堯槙槇遥遙瑶瑤凜熙 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ71","東京都中央区日本橋浜町2-45-1 尭堯槙槇遥遙瑶瑤凜熙","103-0007","13102242","13","102","2-45-1-71","77122","3352","471",,,"尭堯槙槇遥遙瑶瑤凜熙 太郎","カンリヤクザイシメイモジ71 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" +"033673872","85",,"セイシキテンポメイモジ72","リヤクシキモジ72","ツッー-一医院薬鈴田","ツッー-一医院薬鈴田",,,,,"ダイヒヨウシヤメイモジ72 タロウ","ツッー-一医院薬鈴田 太郎",,,"03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 モジ72","東京都中央区日本橋浜町2-45-1 ツッー-一医院薬鈴田","103-0007","13102242","13","102","2-45-1-72","77122","3352","471",,,"ツッー-一医院薬鈴田 太郎","カンリヤクザイシメイモジ72 タロウ",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_pharm_mapper","2023/04/12 00:00:00","com_pharm_mapper" From 45e1f7d87b4ad0897db13bad09dc6b7934591eb9 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 24 Apr 2023 11:43:54 +0900 Subject: [PATCH 62/69] =?UTF-8?q?fix:=20=E6=B4=97=E3=81=84=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E5=87=A6=E7=90=86=E3=80=81=E6=9C=AC=E7=95=AA=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=80=A4=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index c68ae70a..eaaf44c8 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -211,4 +211,4 @@ config: # セキュリティグループ(ecs-all) SG_ECS_ALL: *PRD_SG_ECS_ALL # セキュリティグループ(ecs-jskut-batch-laundering) - SG_JSKULT_BATCH_LAUNDERING: *STG_SG_JSKULT_BATCH_LAUNDERING + SG_JSKULT_BATCH_LAUNDERING: *PRD_SG_JSKULT_BATCH_LAUNDERING From 120ab82a24bf5c00525b899a1cb515f86a7e4cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 24 Apr 2023 13:03:05 +0900 Subject: [PATCH 63/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py index 8794677f..e7bea2a5 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/test_com_nurse_assrt_mapper.py @@ -79,7 +79,7 @@ class TestComNurseAssrtMapper: for actual_row, expect_row in zip(actual_data_list, expect_data_list): line_number += 1 for actual_col_name, expect_col_name in zip(actual_row, expect_row): - if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + if actual_col_name in ignore_columns: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' def test_update_record(self): From 9476720dc7eea8c26b88de9b8045364c074dfdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 24 Apr 2023 14:31:27 +0900 Subject: [PATCH 64/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test_com_forfront_med_equip_mapper.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py index fccc56ad..873d70c6 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/test_com_forfront_med_equip_mapper.py @@ -72,14 +72,14 @@ class TestComForfrontMedEquipMapper: actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = ['sys_update_date', 'sys_regist_date'] + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 for actual_row, expect_row in zip(actual_data_list, expect_data_list): line_number += 1 for actual_col_name, expect_col_name in zip(actual_row, expect_row): - if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + if actual_col_name in ignore_columns: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' def test_update_record(self): @@ -126,7 +126,7 @@ class TestComForfrontMedEquipMapper: actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = ['sys_update_date'] + ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 @@ -183,7 +183,7 @@ class TestComForfrontMedEquipMapper: actual_select_sql = f"SELECT * FROM src05.com_forfront_med_equip WHERE forfront_med_equip_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = ['sys_update_date'] + ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 From 5bba2dd9c4a07428ace87d7dae0458ea18041795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 24 Apr 2023 14:39:25 +0900 Subject: [PATCH 65/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_forfront_med_equip/com_forfront_med_equip_delete.csv | 1 + .../table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv | 1 + 2 files changed, 2 insertions(+) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv index 39f5dce7..36459b1c 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/com_forfront_med_equip_delete.csv @@ -5,3 +5,4 @@ "022","15","A","20141113","20141114","アンガー型カメラ" "022","16","A","20141113","20141114","SPECT" "022","99","C",,,"亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵尾亜居宇絵あ" +"022","98","C","20141113","20141114","血管造影システム" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv index 9eafda82..a89aed2c 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/com_nurse_assrt_delete.csv @@ -5,3 +5,4 @@ "023","4104","A","20141113","20141114","療養型介護療養施設サービス費(Ⅳ)" "023","4999","A","20141113","20141114","療養型介護療養施設サービス費種別不明" "023","4105","A","20141113","20141114","療養型介護療養施設サービス費" +"023","9999","C","20141113","20141114","療養型介護療養施設サービス費(Ⅲ)" From fb999a3a8794ea76d3366ea307254a4c827d0b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 24 Apr 2023 14:46:40 +0900 Subject: [PATCH 66/69] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv | 1 + .../table_mapper/com_pharm/db_com_pharm_before_delete.csv | 1 + .../table_mapper/com_pharm/expect_com_pharm_delete.csv | 1 + .../table_mapper/com_pharm/test_com_pharm_mapper.py | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv index e806d922..fddb0e94 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/com_pharm_delete.csv @@ -1,2 +1,3 @@ "102","03","3673010",,"C","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, "102","9","9","9","C","200501","200601","7","0","9","10","11","12","13","14","15","6","17","18","19","20","221-000","22","23","24","25","26","27","28","29","30","31","32","3","34","35","2","37","38","9","204001","1","204201","43","44","45","46","47" +"102","99","1234567",,"C","20121128","20121129",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv index 9951f19e..75421028 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/db_com_pharm_before_delete.csv @@ -1,3 +1,4 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" "033673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv index 66e0e414..85f84a5c 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_delete.csv @@ -1,3 +1,4 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "033673010","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","20121128","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85","6","セイシキテンポメイ03A02A","リヤクシキ03A02A","正式店舗名03A02a","略式03A02a","","","","","","","","","03-3249-8231","トウキヨウト チユウオウク ニホンバシハマチヨウ 2-45-1 03A02A","東京都中央区日本橋浜町2-45-1 03A02a","103-0007","13102242","13","102","2-45-1-03A02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" "999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","200501","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 00:00:00","com_pharm_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py index 1cdd738c..15d046e4 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/test_com_pharm_mapper.py @@ -79,7 +79,7 @@ class TestComPharmMapper: for actual_row, expect_row in zip(actual_data_list, expect_data_list): line_number += 1 for actual_col_name, expect_col_name in zip(actual_row, expect_row): - if actual_col_name in ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + if actual_col_name in ignore_columns: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' def test_update_record(self): @@ -126,7 +126,7 @@ class TestComPharmMapper: actual_select_sql = f"SELECT * FROM src05.com_pharm WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = ['sys_update_date'] + ignore_columns = ['sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 @@ -183,7 +183,7 @@ class TestComPharmMapper: actual_select_sql = f"SELECT * FROM src05.com_pharm WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = ['sys_update_date'] + ignore_columns = ['sys_update_date', 'sys_regist_date'] assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 From 3ed8363a0f8abc978813447ec4f180d16d27bd50 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 24 Apr 2023 16:44:40 +0900 Subject: [PATCH 67/69] =?UTF-8?q?feat:=20=E3=82=B3=E3=83=B3=E3=83=95?= =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=83=88=E3=82=92=E8=A7=A3=E6=B6=88=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=81=AB=E3=80=81=E3=83=A2=E3=82=B8?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=AB=E3=81=94=E3=81=A8=E3=81=AB=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/__init__.py | 8 -- .../ultmarc_table_mapper_factory.py | 89 ++++++++++--------- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/__init__.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/__init__.py index b0f23166..e69de29b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/__init__.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/__init__.py @@ -1,8 +0,0 @@ -import glob -import os - -# 同階層内のモジュールを一括でインポート -__all__ = [ - os.path.split(os.path.splitext(file)[0])[1] - for file in glob.glob(os.path.join(os.path.dirname(__file__), '[a-zA-Z0-9]*.py')) -] \ No newline at end of file diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index 1a41bf6b..336a6d4b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -1,7 +1,17 @@ -from src.batch.ultmarc.utmp_tables.table_mapper.concrete import ( - com_alma_mapper, com_dr_wrkplace_mapper, com_hamtec_mapper, - com_inst_mapper, com_forfront_med_equip_mapper, com_nurse_assrt_mapper, null_mapper) - +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_alma_mapper import \ + ComAlmaMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_dr_wrkplace_mapper import \ + ComDrWrkplaceMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_forfront_med_equip_mapper import \ + ComForfrontMedEquipMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_hamtec_mapper import \ + ComHamtecMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_inst_mapper import \ + ComInstMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_nurse_assrt_mapper import \ + ComNurseAssrtMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ + NullMapper from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper from src.db.database import Database @@ -10,76 +20,75 @@ from src.db.database import Database COM_TABLE_LIST = { # レコードID固定 # COM_医師学会 - # TODO: 入れ子にしない - "521": null_mapper.NullMapper, + "521": NullMapper, # COM_施設属性 - "111": null_mapper.NullMapper, + "111": NullMapper, # COM_臨床研修病院 - "112": null_mapper.NullMapper, + "112": NullMapper, # COM_医師 - "501": null_mapper.NullMapper, + "501": NullMapper, # COM_施設 - "101": com_inst_mapper.ComInstMapper, + "101": ComInstMapper, # COM_薬局 - "102": null_mapper.NullMapper, + "102": NullMapper, # COM_医師勤務先 - "502": com_dr_wrkplace_mapper.ComDrWrkplaceMapper, + "502": ComDrWrkplaceMapper, # COM_専門分野 - "511": null_mapper.NullMapper, + "511": NullMapper, # COM_都道府県医療機能情報(基本) - "132": null_mapper.NullMapper, + "132": NullMapper, # COM_都道府県医療機能情報(施設設備) - "133": null_mapper.NullMapper, + "133": NullMapper, # COM_都道府県医療機能情報(疾患治療) - "134": null_mapper.NullMapper, + "134": NullMapper, # COM_都道府県医療機能情報(短期滞在手術) - "135": null_mapper.NullMapper, + "135": NullMapper, # COM_都道府県医療機能情報(専門外来) - "136": null_mapper.NullMapper, + "136": NullMapper, # COM_診療科目 - "001": null_mapper.NullMapper, + "001": NullMapper, # COM_病院種別 - "002": null_mapper.NullMapper, + "002": NullMapper, # COM_出身校学部識別 - "003": null_mapper.NullMapper, + "003": NullMapper, # COM_出身校 - "004": com_alma_mapper.ComAlmaMapper, + "004": ComAlmaMapper, # COM_役職 - "005": null_mapper.NullMapper, + "005": NullMapper, # 都道府県マスタ - "006": null_mapper.NullMapper, + "006": NullMapper, # COM_経営体 - "007": null_mapper.NullMapper, + "007": NullMapper, # COM_所属部科 - "008": null_mapper.NullMapper, + "008": NullMapper, # COM_学会 - "009": null_mapper.NullMapper, + "009": NullMapper, # COM_専門医資格 - "010": null_mapper.NullMapper, + "010": NullMapper, # COM_施設区分 - "011": null_mapper.NullMapper, + "011": NullMapper, # COM_高度先進医療 - "021": com_hamtec_mapper.ComHamtecMapper, + "021": ComHamtecMapper, # COM_先端医療機器 - "022": com_forfront_med_equip_mapper.ComForfrontMedEquipMapper, + "022": ComForfrontMedEquipMapper, # COM_看護種別 - "023": com_nurse_assrt_mapper.ComNurseAssrtMapper, + "023": ComNurseAssrtMapper, # COM_医療機能評価 - "024": null_mapper.NullMapper, + "024": NullMapper, # COM_地域クリティカルパス - "026": null_mapper.NullMapper, + "026": NullMapper, # COM_疾患別リハビリテーション科 - "027": null_mapper.NullMapper, + "027": NullMapper, # COM_政策医療 - "028": null_mapper.NullMapper, + "028": NullMapper, # COM_医療圏都道府県 - "121": null_mapper.NullMapper, + "121": NullMapper, # COM_医療圏3次マスタ - "122": null_mapper.NullMapper, + "122": NullMapper, # COM_二次医療圏 - "123": null_mapper.NullMapper, + "123": NullMapper, # COM_医療圏都道府県市町村対照表 - "124": null_mapper.NullMapper + "124": NullMapper } From de81612a8bd24e8607851a1f72d3702b92520183 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 24 Apr 2023 16:53:50 +0900 Subject: [PATCH 68/69] =?UTF-8?q?feat:=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B7=AE=E5=88=86=E3=82=92=E3=82=82=E3=81=A8?= =?UTF-8?q?=E3=81=AB=E6=88=BB=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index e9ded3b7..5639f7fc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,15 +8,11 @@ "name": "Python: データ取り込みローカル実行", "type": "python", "request": "launch", - "program": "entrypoint.py", + // windowsだと\区切りかも + "program": "ecs\\dataimport\\dataimport\\controller.py", "console": "integratedTerminal", "justMyCode": true, "envFile": "${workspaceFolder}/.env" - }, - { "name": "Python: Current File", - "type": "python", - "request": "test", - "console": "integratedTerminal" } ] } \ No newline at end of file From ef559f7f5b68d92e1361265a47af3ab211ecdbc1 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 24 Apr 2023 16:54:43 +0900 Subject: [PATCH 69/69] =?UTF-8?q?feat:=20=E6=88=BB=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5639f7fc..753ba49f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,6 +13,13 @@ "console": "integratedTerminal", "justMyCode": true, "envFile": "${workspaceFolder}/.env" + }, + { + "name": "Python: Attach using Process Id", + "type": "python", + "request": "attach", + "processId": "${command:pickProcess}", + "justMyCode": true } ] } \ No newline at end of file