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] =?UTF-8?q?feat:=20=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=82=92=E8=A7=A3=E6=B6=88=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AB=E3=80=81=E3=83=A2=E3=82=B8=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=94=E3=81=A8=E3=81=AB=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?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/__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_医療圏３次マスタ - "122": null_mapper.NullMapper, + "122": NullMapper, # COM_二次医療圏 - "123": null_mapper.NullMapper, + "123": NullMapper, # COM_医療圏都道府県市町村対照表 - "124": null_mapper.NullMapper + "124": NullMapper }