From 7deebe6208e3fef3db62f613fe0e9f6e2adb5282 Mon Sep 17 00:00:00 2001 From: Nik Afiq Date: Wed, 29 Nov 2023 16:04:43 +0900 Subject: [PATCH] =?UTF-8?q?"com=5Fprefc=5Fmed=5Fbase=E5=8F=96=E8=BE=BC?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_prefc_med_base_mapper.py | 361 ++++++++++-------- .../com_prefc_med_base_insert.csv | 11 +- .../expect_com_prefc_med_base_insert.csv | 11 +- 3 files changed, 207 insertions(+), 176 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py index 2c8bd8e0..4ed67b30 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py @@ -1,5 +1,6 @@ -from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ - UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import ( + UltmarcTableMapper, +) from src.batch.ultmarc.utmp_tables.tables.com_prefc_med_base import ComPrefcMedBase @@ -191,15 +192,18 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper): def __init__(self, record: list[str], db) -> None: super().__init__(record, db, ComPrefcMedBase) - program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + program_name = __name__.split(".")[-1] # 当モジュール名(現行から変わっている) # モジュール名をクエリパラメータに設定 - self.query_parameter['program_name'] = program_name + self.query_parameter["program_name"] = program_name # 読み込んだレコード値もクエリパラメータに追加 - self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + self.query_parameter = { + **self.query_parameter, + **self.record.to_sql_parameter(), + } def make_query(self): # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 - if self.record.maint_flag == 'B' and self.record.adddel_div == '1': + if self.record.maint_flag == "B" and self.record.adddel_div == "1": self.queries.append(self.PHYSICAL_DELETE_QUERY) return @@ -208,10 +212,125 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper): return def __make_upsert_query(self): + # 修正のレコードだった場合はNULLに変換する + # 情報年月日 + if self.record.info_date == "@": + self.query_parameter["info_date"] = None + # 案内用ﾎｰﾑﾍﾟｰｼﾞｱﾄﾞﾚｽ + if self.record.home_page == "@": + self.query_parameter["home_page"] = None + # 院内処方ﾌﾗｸﾞ + if self.record.hppre_flg == "@": + self.query_parameter["hppre_flg"] = None + # 院外処方ﾌﾗｸﾞ + if self.record.expre_flg == "@": + self.query_parameter["expre_flg"] = None + # 治験の実施 + if self.record.trial_flg == "@": + self.query_parameter["trial_flg"] = None + self.query_parameter["trial_cont_count"] = None + self.query_parameter["trial_whet_from"] = None + self.query_parameter["trial_whet_to"] = None + # 保有する施設設備ﾌﾗｸﾞ + if self.record.equipment_flg == "@": + self.query_parameter["equipment_flg"] = None + # 対応することができる疾患･治療の内容ﾌﾗｸﾞ + if self.record.cos_disease_flg == "@": + self.query_parameter["cos_disease_flg"] = None + # 対応することができる短期滞在手術ﾌﾗｸﾞ + if self.record.cos_surgery == "@": + self.query_parameter["cos_surgery"] = None + # 専門外来ﾌﾗｸﾞ + if self.record.specialclinic_flg == "@": + self.query_parameter["specialclinic_flg"] = None + # 地域医療連携体制_窓口設置ﾌﾗｸﾞ + if self.record.establishment_flg == "@": + self.query_parameter["establishment_flg"] = None + # 地域医療連携体制_地域連携ﾊﾟｽﾌﾗｸﾞ + if self.record.critical_flg == "@": + self.query_parameter["critical_flg"] = None + # 入院診療計画策定時における院内の連携体制 + if self.record.cop_system == "@": + self.query_parameter["cop_system"] = None + # ｵｰﾀﾞﾘﾝｸﾞｼｽﾃﾑ + if self.record.sys_exists_flg == "@": + self.query_parameter["sys_exists_flg"] = None + self.query_parameter["sys_inspection"] = None + self.query_parameter["sys_prescription"] = None + self.query_parameter["sys_reserv"] = None + # ICDｺｰﾄﾞ利用ﾌﾗｸﾞ + if self.record.icduse_flg == "@": + self.query_parameter["icduse_flg"] = None + # 電子ｶﾙﾃﾌﾗｸ + if self.record.echart_flg == "@": + self.query_parameter["echart_flg"] = None + # 専任従事者 + if self.record.fulltime_flg == "@": + self.query_parameter["fulltime_flg"] = None + self.query_parameter["fulltime_count"] = None + # 病床患者数平均 + if self.record.ge_patient_avg == "@": + self.query_parameter["ge_patient_avg"] = None + self.query_parameter["mt_patient_avg"] = None + self.query_parameter["mc_patient_avg"] = None + self.query_parameter["ca_patient_avg"] = None + self.query_parameter["pys_patient_avg"] = None + self.query_parameter["inf_patient_avg"] = None + self.query_parameter["tub_patient_avg"] = None + self.query_parameter["patient_avg_sum"] = None + self.query_parameter["patient_avg_from"] = None + self.query_parameter["patient_avg_to"] = None + # 患者数平均 + if self.record.cl_patient_avg == "@": + self.query_parameter["cl_patient_avg"] = None + self.query_parameter["cl_patient_avg_from"] = None + self.query_parameter["cl_patient_avg_to"] = None + # 患者数平均 + if self.record.hm_patient_avg == "@": + self.query_parameter["hm_patient_avg"] = None + self.query_parameter["hm_patient_avg_from"] = None + self.query_parameter["hm_patient_avg_to"] = None + # 患者数延数 + if self.record.ge_patient_ex == "@": + self.query_parameter["ge_patient_ex"] = None + self.query_parameter["mt_patient_ex"] = None + self.query_parameter["mc_patient_ex"] = None + self.query_parameter["ca_patient_ex"] = None + self.query_parameter["pys_patient_ex"] = None + self.query_parameter["tub_patient_ex"] = None + self.query_parameter["inf_patient_ex"] = None + self.query_parameter["patient_ex_sum"] = None + self.query_parameter["patient_ex_from"] = None + self.query_parameter["patient_ex_to"] = None + # 患者数延数 + if self.record.cl_patient_ex == "@": + self.query_parameter["cl_patient_ex"] = None + self.query_parameter["cl_patient_ex_from"] = None + self.query_parameter["cl_patient_ex_to"] = None + # 患者数延数 + if self.record.hm_patient_ex == "@": + self.query_parameter["hm_patient_ex"] = None + self.query_parameter["hm_patient_ex_from"] = None + self.query_parameter["hm_patient_ex_to"] = None + # 平均在院日数 + if self.record.ge_stay_avg == "@": + self.query_parameter["ge_stay_avg"] = None + self.query_parameter["mt_stay_avg"] = None + self.query_parameter["mc_stay_avg"] = None + self.query_parameter["ca_stay_avg"] = None + self.query_parameter["pys_stay_avg"] = None + self.query_parameter["tub_stay_avg"] = None + self.query_parameter["inf_stay_avg"] = None + self.query_parameter["stay_avg_sum"] = None + self.query_parameter["stay_avg_from"] = None + self.query_parameter["stay_avg_to"] = None + # レコードの存在確認 - record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + record_count = self.db.execute_select( + self.RECORD_EXISTS_QUERY, self.query_parameter + ) # 存在しない場合はInsert - if record_count[0]['count_num'] == 0: + if record_count[0]["count_num"] == 0: return self.INSERT_QUERY # 存在する場合ではUpdate @@ -222,234 +341,144 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper): # 情報年月日 if len(self.record.info_date) > 0: - set_clauses.append('info_date = :info_date') - if self.record.info_date == '@': - self.query_parameter['info_date'] = None + set_clauses.append("info_date = :info_date") # 案内用ﾎｰﾑﾍﾟｰｼﾞｱﾄﾞﾚｽ if len(self.record.home_page) > 0: - set_clauses.append('home_page = :home_page') - if self.record.home_page == '@': - self.query_parameter['home_page'] = None + set_clauses.append("home_page = :home_page") # 院内処方ﾌﾗｸﾞ if len(self.record.hppre_flg) > 0: - set_clauses.append('hppre_flg = :hppre_flg') - if self.record.hppre_flg == '@': - self.query_parameter['hppre_flg'] = None + set_clauses.append("hppre_flg = :hppre_flg") # 院外処方ﾌﾗｸﾞ if len(self.record.expre_flg) > 0: - set_clauses.append('expre_flg = :expre_flg') - if self.record.expre_flg == '@': - self.query_parameter['expre_flg'] = None + set_clauses.append("expre_flg = :expre_flg") # 治験の実施 if len(self.record.trial_flg) > 0: - set_clauses.append('trial_flg = :trial_flg') - set_clauses.append('trial_contcount = :trial_cont_count') - set_clauses.append('trialwhet_from = :trial_whet_from') - set_clauses.append('trialwhet_to = :trial_whet_to') - if self.record.trial_flg == '@': - self.query_parameter['trial_flg'] = None - self.query_parameter['trial_cont_count'] = None - self.query_parameter['trial_whet_from'] = None - self.query_parameter['trial_whet_to'] = None + set_clauses.append("trial_flg = :trial_flg") + set_clauses.append("trial_contcount = :trial_cont_count") + set_clauses.append("trialwhet_from = :trial_whet_from") + set_clauses.append("trialwhet_to = :trial_whet_to") # 保有する施設設備ﾌﾗｸﾞ if len(self.record.equipment_flg) > 0: - set_clauses.append('equipment_flg = :equipment_flg') - if self.record.equipment_flg == '@': - self.query_parameter['equipment_flg'] = None + set_clauses.append("equipment_flg = :equipment_flg") # 対応することができる疾患･治療の内容ﾌﾗｸﾞ if len(self.record.cos_disease_flg) > 0: - set_clauses.append('cos_disease_flg = :cos_disease_flg') - if self.record.cos_disease_flg == '@': - self.query_parameter['cos_disease_flg'] = None + set_clauses.append("cos_disease_flg = :cos_disease_flg") # 対応することができる短期滞在手術ﾌﾗｸﾞ if len(self.record.cos_surgery) > 0: - set_clauses.append('cos_surgery = :cos_surgery') - if self.record.cos_surgery == '@': - self.query_parameter['cos_surgery'] = None + set_clauses.append("cos_surgery = :cos_surgery") # 専門外来ﾌﾗｸﾞ if len(self.record.specialclinic_flg) > 0: - set_clauses.append('specialclinic_flg = :specialclinic_flg') - if self.record.specialclinic_flg == '@': - self.query_parameter['specialclinic_flg'] = None + set_clauses.append("specialclinic_flg = :specialclinic_flg") # 地域医療連携体制_窓口設置ﾌﾗｸﾞ if len(self.record.establishment_flg) > 0: - set_clauses.append('establishment_flg = :establishment_flg') - if self.record.establishment_flg == '@': - self.query_parameter['establishment_flg'] = None + set_clauses.append("establishment_flg = :establishment_flg") # 地域医療連携体制_地域連携ﾊﾟｽﾌﾗｸﾞ if len(self.record.critical_flg) > 0: - set_clauses.append('critical_flg = :critical_flg') - if self.record.critical_flg == '@': - self.query_parameter['critical_flg'] = None + set_clauses.append("critical_flg = :critical_flg") # 入院診療計画策定時における院内の連携体制 if len(self.record.cop_system) > 0: - set_clauses.append('cop_system = :cop_system') - if self.record.cop_system == '@': - self.query_parameter['cop_system'] = None + set_clauses.append("cop_system = :cop_system") # ｵｰﾀﾞﾘﾝｸﾞｼｽﾃﾑ if len(self.record.sys_exists_flg) > 0: - set_clauses.append('sys_exists_flg = :sys_exists_flg') - set_clauses.append('sys_inspection = :sys_inspection') - set_clauses.append('sys_prescription = :sys_prescription') - set_clauses.append('sys_reserv = :sys_reserv') - if self.record.sys_exists_flg == '@': - self.query_parameter['sys_exists_flg'] = None - self.query_parameter['sys_inspection'] = None - self.query_parameter['sys_prescription'] = None - self.query_parameter['sys_reserv'] = None + set_clauses.append("sys_exists_flg = :sys_exists_flg") + set_clauses.append("sys_inspection = :sys_inspection") + set_clauses.append("sys_prescription = :sys_prescription") + set_clauses.append("sys_reserv = :sys_reserv") # ICDｺｰﾄﾞ利用ﾌﾗｸﾞ if len(self.record.icduse_flg) > 0: - set_clauses.append('icduse_flg = :icduse_flg') - if self.record.icduse_flg == '@': - self.query_parameter['icduse_flg'] = None + set_clauses.append("icduse_flg = :icduse_flg") # 電子ｶﾙﾃﾌﾗｸ if len(self.record.echart_flg) > 0: - set_clauses.append('echart_flg = :echart_flg') - if self.record.echart_flg == '@': - self.query_parameter['echart_flg'] = None + set_clauses.append("echart_flg = :echart_flg") # 専任従事者 if len(self.record.fulltime_flg) > 0: - set_clauses.append('fulltime_flg = :fulltime_flg') - set_clauses.append('fulltime_count = :fulltime_count') - if self.record.fulltime_flg == '@': - self.query_parameter['fulltime_flg'] = None - self.query_parameter['fulltime_count'] = None + set_clauses.append("fulltime_flg = :fulltime_flg") + set_clauses.append("fulltime_count = :fulltime_count") # 病床患者数平均 if len(self.record.ge_patient_avg) > 0: - set_clauses.append('ge_patient_avg = :ge_patient_avg') - set_clauses.append('mt_patient_avg = :mt_patient_avg') - set_clauses.append('mc_patient_avg = :mc_patient_avg') - set_clauses.append('ca_patient_avg = :ca_patient_avg') - set_clauses.append('pys_patient_avg = :pys_patient_avg') - set_clauses.append('tub_patient_avg = :inf_patient_avg') - set_clauses.append('inf_patient_avg = :tub_patient_avg') - set_clauses.append('patient_avg_sum = :patient_avg_sum') - set_clauses.append('patient_avg_from = :patient_avg_from') - set_clauses.append('patient_avg_to = :patient_avg_to') - if self.record.ge_patient_avg == '@': - self.query_parameter['ge_patient_avg'] = None - self.query_parameter['mt_patient_avg'] = None - self.query_parameter['mc_patient_avg'] = None - self.query_parameter['ca_patient_avg'] = None - self.query_parameter['pys_patient_avg'] = None - self.query_parameter['inf_patient_avg'] = None - self.query_parameter['tub_patient_avg'] = None - self.query_parameter['patient_avg_sum'] = None - self.query_parameter['patient_avg_from'] = None - self.query_parameter['patient_avg_to'] = None + set_clauses.append("ge_patient_avg = :ge_patient_avg") + set_clauses.append("mt_patient_avg = :mt_patient_avg") + set_clauses.append("mc_patient_avg = :mc_patient_avg") + set_clauses.append("ca_patient_avg = :ca_patient_avg") + set_clauses.append("pys_patient_avg = :pys_patient_avg") + set_clauses.append("tub_patient_avg = :inf_patient_avg") + set_clauses.append("inf_patient_avg = :tub_patient_avg") + set_clauses.append("patient_avg_sum = :patient_avg_sum") + set_clauses.append("patient_avg_from = :patient_avg_from") + set_clauses.append("patient_avg_to = :patient_avg_to") # 患者数平均 if len(self.record.cl_patient_avg) > 0: - set_clauses.append('cl_patient_avg = :cl_patient_avg') - set_clauses.append('cl_patient_avg_from = :cl_patient_avg_from') - set_clauses.append('cl_patient_avg_to = :cl_patient_avg_to') - if self.record.cl_patient_avg == '@': - self.query_parameter['cl_patient_avg'] = None - self.query_parameter['cl_patient_avg_from'] = None - self.query_parameter['cl_patient_avg_to'] = None + set_clauses.append("cl_patient_avg = :cl_patient_avg") + set_clauses.append("cl_patient_avg_from = :cl_patient_avg_from") + set_clauses.append("cl_patient_avg_to = :cl_patient_avg_to") # 患者数平均 if len(self.record.hm_patient_avg) > 0: - set_clauses.append('hm_patient_avg = :hm_patient_avg') - set_clauses.append('hm_patient_avg_from = :hm_patient_avg_from') - set_clauses.append('hm_patient_avg_to = :hm_patient_avg_to') - if self.record.hm_patient_avg == '@': - self.query_parameter['hm_patient_avg'] = None - self.query_parameter['hm_patient_avg_from'] = None - self.query_parameter['hm_patient_avg_to'] = None + set_clauses.append("hm_patient_avg = :hm_patient_avg") + set_clauses.append("hm_patient_avg_from = :hm_patient_avg_from") + set_clauses.append("hm_patient_avg_to = :hm_patient_avg_to") # 患者数延数 if len(self.record.ge_patient_ex) > 0: - set_clauses.append('ge_patient_ex = :ge_patient_ex') - set_clauses.append('mt_patient_ex = :mt_patient_ex') - set_clauses.append('mc_patient_ex = :mc_patient_ex') - set_clauses.append('ca_patient_ex = :ca_patient_ex') - set_clauses.append('pys_patient_ex = :pys_patient_ex') - set_clauses.append('tub_patient_ex = :tub_patient_ex') - set_clauses.append('inf_patient_ex = :inf_patient_ex') - set_clauses.append('patient_ex_sum = :patient_ex_sum') - set_clauses.append('patient_ex_from = :patient_ex_from') - set_clauses.append('patient_ex_to = :patient_ex_to') - if self.record.ge_patient_ex == '@': - self.query_parameter['ge_patient_ex'] = None - self.query_parameter['mt_patient_ex'] = None - self.query_parameter['mc_patient_ex'] = None - self.query_parameter['ca_patient_ex'] = None - self.query_parameter['pys_patient_ex'] = None - self.query_parameter['tub_patient_ex'] = None - self.query_parameter['inf_patient_ex'] = None - self.query_parameter['patient_ex_sum'] = None - self.query_parameter['patient_ex_from'] = None - self.query_parameter['patient_ex_to'] = None + set_clauses.append("ge_patient_ex = :ge_patient_ex") + set_clauses.append("mt_patient_ex = :mt_patient_ex") + set_clauses.append("mc_patient_ex = :mc_patient_ex") + set_clauses.append("ca_patient_ex = :ca_patient_ex") + set_clauses.append("pys_patient_ex = :pys_patient_ex") + set_clauses.append("tub_patient_ex = :tub_patient_ex") + set_clauses.append("inf_patient_ex = :inf_patient_ex") + set_clauses.append("patient_ex_sum = :patient_ex_sum") + set_clauses.append("patient_ex_from = :patient_ex_from") + set_clauses.append("patient_ex_to = :patient_ex_to") # 患者数延数 if len(self.record.cl_patient_ex) > 0: - set_clauses.append('cl_patient_ex = :cl_patient_ex') - set_clauses.append('cl_patient_ex_from = :cl_patient_ex_from') - set_clauses.append('cl_patient_ex_to = :cl_patient_ex_to') - if self.record.cl_patient_ex == '@': - self.query_parameter['cl_patient_ex'] = None - self.query_parameter['cl_patient_ex_from'] = None - self.query_parameter['cl_patient_ex_to'] = None + set_clauses.append("cl_patient_ex = :cl_patient_ex") + set_clauses.append("cl_patient_ex_from = :cl_patient_ex_from") + set_clauses.append("cl_patient_ex_to = :cl_patient_ex_to") # 患者数延数 if len(self.record.hm_patient_ex) > 0: - set_clauses.append('hm_patient_ex = :hm_patient_ex') - set_clauses.append('hm_patient_ex_from = :hm_patient_ex_from') - set_clauses.append('hm_patient_ex_to = :hm_patient_ex_to') - if self.record.hm_patient_ex == '@': - self.query_parameter['hm_patient_ex'] = None - self.query_parameter['hm_patient_ex_from'] = None - self.query_parameter['hm_patient_ex_to'] = None + set_clauses.append("hm_patient_ex = :hm_patient_ex") + set_clauses.append("hm_patient_ex_from = :hm_patient_ex_from") + set_clauses.append("hm_patient_ex_to = :hm_patient_ex_to") # 平均在院日数 if len(self.record.ge_stay_avg) > 0: - set_clauses.append('ge_stay_avg = :ge_stay_avg') - set_clauses.append('mt_stay_avg = :mt_stay_avg') - set_clauses.append('mc_stay_avg = :mc_stay_avg') - set_clauses.append('ca_stay_avg = :ca_stay_avg') - set_clauses.append('pys_stay_avg = :pys_stay_avg') - set_clauses.append('tub_stay_avg = :tub_stay_avg') - set_clauses.append('inf_stay_avg = :inf_stay_avg') - set_clauses.append('stay_avg_sum = :stay_avg_sum') - set_clauses.append('stay_avg_from = :stay_avg_from') - set_clauses.append('stay_avg_to = :stay_avg_to') - if self.record.ge_stay_avg == '@': - self.query_parameter['ge_stay_avg'] = None - self.query_parameter['mt_stay_avg'] = None - self.query_parameter['mc_stay_avg'] = None - self.query_parameter['ca_stay_avg'] = None - self.query_parameter['pys_stay_avg'] = None - self.query_parameter['tub_stay_avg'] = None - self.query_parameter['inf_stay_avg'] = None - self.query_parameter['stay_avg_sum'] = None - self.query_parameter['stay_avg_from'] = None - self.query_parameter['stay_avg_to'] = None + set_clauses.append("ge_stay_avg = :ge_stay_avg") + set_clauses.append("mt_stay_avg = :mt_stay_avg") + set_clauses.append("mc_stay_avg = :mc_stay_avg") + set_clauses.append("ca_stay_avg = :ca_stay_avg") + set_clauses.append("pys_stay_avg = :pys_stay_avg") + set_clauses.append("tub_stay_avg = :tub_stay_avg") + set_clauses.append("inf_stay_avg = :inf_stay_avg") + set_clauses.append("stay_avg_sum = :stay_avg_sum") + set_clauses.append("stay_avg_from = :stay_avg_from") + set_clauses.append("stay_avg_to = :stay_avg_to") - update_columns = ','.join(set_clauses) + update_columns = ",".join(set_clauses) # 何も更新項目が無い場合はNoneとする（更新処理は行わない） if len(update_columns) == 0: return None else: # 末尾にカンマを付けてSET句を完成させる - update_columns += ',' - update_query = self.UPDATE_QUERY.format( - update_columns=update_columns - ) + update_columns += "," + update_query = self.UPDATE_QUERY.format(update_columns=update_columns) return update_query diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/com_prefc_med_base_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/com_prefc_med_base_insert.csv index 81dd90b1..608f522f 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/com_prefc_med_base_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/com_prefc_med_base_insert.csv @@ -1,6 +1,7 @@ -"132","00","9900146","","A","2","20141113","20141114","20140624","","1","","","","","","1","1","","","","","","","","","","","","","","18.8","","","","","","","","20130401","20140331","49.8","20130401","20140331","","","","","","","","","","","","","","","","","","","","39.3","","","","","","","","20130401","20140331" -"132","00","9900194","","A","2","20141113","20141114","20121101","http://www.hospital.misawa.aomori.jp/","1","1","1","0","20100401","20110331","1","1","1","1","1","1","1","1","1","1","1","1","1","1","3","205.4","","","","","","","","20100401","20110331","468.1","20100401","20110331","8.3","20100401","20110331","","","","","","","","","","","","","","","","","18.7","","","","","","0.0","","20100401","20110331" -"132","00","9901649","","A","2","20141113","20141114","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","" -"132","00","9901679","","A","2","20141113","20141114","20140627","http://www.kai-sei-kai.com/","1","","","","","","1","1","1","1","1","","1","","","","","1","","1","2","58.5","229.2","102.3","131.3","","","","","20130401","20140331","96.0","20130401","20140331","","","","","","","","","","","","","","","","","","","","20.4","641.3","533.2","749.2","","","","","20130401","20140331" -"132","00","9929798","","A","2","20141113","20141114","20130611","http://www.urakawa.jrc.or.jp/","1","","","","","","1","1","1","1","1","","1","","","","","","","1","1","114.6","46.6","","","39.9","0.0","0.0","","20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331","","","","","","","","","","","","","","","","","15.6","555.3","","","169.4","0.0","0.0","","20120401","20130331" +"132","00","9900146",,"A","2","20141113","20141114","20140624",,"1",,,,,,"1","1",,,,,,,,,,,,,,"18.8",,,,,,,,"20130401","20140331","49.8","20130401","20140331",,,,,,,,,,,,,,,,,,,,"39.3",,,,,,,,"20130401","20140331" +"132","00","9900194",,"A","2","20141113","20141114","20121101","http://www.hospital.misawa.aomori.jp/","1","1","1","0","20100401","20110331","1","1","1","1","1","1","1","1","1","1","1","1","1","1","3","205.4",,,,,,,,"20100401","20110331","468.1","20100401","20110331","8.3","20100401","20110331",,,,,,,,,,,,,,,,,"18.7",,,,,,"0.0",,"20100401","20110331" +"132","00","9901649",,"A","2","20141113","20141114",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"132","00","9901679",,"A","2","20141113","20141114","20140627","http://www.kai-sei-kai.com/","1",,,,,,"1","1","1","1","1",,"1",,,,,"1",,"1","2","58.5","229.2","102.3","131.3",,,,,"20130401","20140331","96.0","20130401","20140331",,,,,,,,,,,,,,,,,,,,"20.4","641.3","533.2","749.2",,,,,"20130401","20140331" +"132","00","9929798",,"A","2","20141113","20141114","20130611","http://www.urakawa.jrc.or.jp/","1",,,,,,"1","1","1","1","1",,"1",,,,,,,"1","1","114.6","46.6",,,"39.9","0.0","0.0",,"20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331",,,,,,,,,,,,,,,,,"15.6","555.3",,,"169.4","0.0","0.0",,"20120401","20130331" +"132","99","9999999","88","A","2","20141113","20141114","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@","@" "132","99","9999999","99","A","2","20141113","20141114","20130611","aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz","1","2","3","4444","20150101","20160101","1","1","1","1","1","1","1","1","1","1","1","1","1","1","123","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","12345.6","20120401","20130331","12345.6","20120401","20130331","123467","123467","123467","123467","123467","123467","123467","123467","20200202","20200202","123467","20200202","20200202","123467","20200202","20200202","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/expect_com_prefc_med_base_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/expect_com_prefc_med_base_insert.csv index 306d8b30..f025fcb5 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/expect_com_prefc_med_base_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/expect_com_prefc_med_base_insert.csv @@ -1,7 +1,8 @@ "dcf_dsf_inst_cd","info_date","home_page","hppre_flg","expre_flg","trial_flg","trial_contcount","trialwhet_from","trialwhet_to","equipment_flg","cos_disease_flg","cos_surgery","specialclinic_flg","establishment_flg","critical_flg","cop_system","sys_exists_flg","sys_inspection","sys_prescription","sys_reserv","icduse_flg","echart_flg","fulltime_flg","fulltime_count","ge_patient_avg","mt_patient_avg","mc_patient_avg","ca_patient_avg","pys_patient_avg","tub_patient_avg","inf_patient_avg","patient_avg_sum","patient_avg_from","patient_avg_to","cl_patient_avg","cl_patient_avg_from","cl_patient_avg_to","hm_patient_avg","hm_patient_avg_from","hm_patient_avg_to","ge_patient_ex","mt_patient_ex","mc_patient_ex","ca_patient_ex","pys_patient_ex","tub_patient_ex","inf_patient_ex","patient_ex_sum","patient_ex_from","patient_ex_to","cl_patient_ex","cl_patient_ex_from","cl_patient_ex_to","hm_patient_ex","hm_patient_ex_from","hm_patient_ex_to","ge_stay_avg","mt_stay_avg","mc_stay_avg","ca_stay_avg","pys_stay_avg","tub_stay_avg","inf_stay_avg","stay_avg_sum","stay_avg_from","stay_avg_to","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"009900146","20140624","","1","","","","","","1","1","","","","","","","","","","","","","","18.8","","","","","","","","20130401","20140331","49.8","20130401","20140331","","","","","","","","","","","","","","","","","","","","39.3","","","","","","","","20130401","20140331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" -"009900194","20121101","http://www.hospital.misawa.aomori.jp/","1","1","1","0","20100401","20110331","1","1","1","1","1","1","1","1","1","1","1","1","1","1","3","205.4","","","","","","","","20100401","20110331","468.1","20100401","20110331","8.3","20100401","20110331","","","","","","","","","","","","","","","","","18.7","","","","","","0.0","","20100401","20110331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" -"009901649","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" -"009901679","20140627","http://www.kai-sei-kai.com/","1","","","","","","1","1","1","1","1","","1","","","","","1","","1","2","58.5","229.2","102.3","131.3","","","","","20130401","20140331","96.0","20130401","20140331","","","","","","","","","","","","","","","","","","","","20.4","641.3","533.2","749.2","","","","","20130401","20140331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" -"009929798","20130611","http://www.urakawa.jrc.or.jp/","1","","","","","","1","1","1","1","1","","1","","","","","","","1","1","114.6","46.6","","","39.9","0.0","0.0","","20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331","","","","","","","","","","","","","","","","","15.6","555.3","","","169.4","0.0","0.0","","20120401","20130331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"009900146","20140624",,"1",,,,,,"1","1",,,,,,,,,,,,,,"18.8",,,,,,,,"20130401","20140331","49.8","20130401","20140331",,,,,,,,,,,,,,,,,,,,"39.3",,,,,,,,"20130401","20140331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"009900194","20121101","http://www.hospital.misawa.aomori.jp/","1","1","1","0","20100401","20110331","1","1","1","1","1","1","1","1","1","1","1","1","1","1","3","205.4",,,,,,,,"20100401","20110331","468.1","20100401","20110331","8.3","20100401","20110331",,,,,,,,,,,,,,,,,"18.7",,,,,,"0.0",,"20100401","20110331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"009901649",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"009901679","20140627","http://www.kai-sei-kai.com/","1",,,,,,"1","1","1","1","1",,"1",,,,,"1",,"1","2","58.5","229.2","102.3","131.3",,,,,"20130401","20140331","96.0","20130401","20140331",,,,,,,,,,,,,,,,,,,,"20.4","641.3","533.2","749.2",,,,,"20130401","20140331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"009929798","20130611","http://www.urakawa.jrc.or.jp/","1",,,,,,"1","1","1","1","1",,"1",,,,,,,"1","1","114.6","46.6",,,"39.9","0.0","0.0",,"20120401","20130331","481.6","20120401","20130331","16.2","20120401","20130331",,,,,,,,,,,,,,,,,"15.6","555.3",,,"169.4","0.0","0.0",,"20120401","20130331","20230510","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper" +"99999999988","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","20130331","NULL","NULL","NULL","NULL","NULL","2000/05/09 20:39:15","com_prefc_med_base_mapper","2000/05/09 20:39:15","com_prefc_med_base_mapper" "99999999999","20130611","aaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbbaaaaaaaaaabbbbbbbbbz","1","2","3","4444","20150101","20160101","1","1","1","1","1","1","1","1","1","1","1","1","1","1","123","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","12345.6","20120401","20130331","12345.6","20120401","20130331","123467","123467","123467","123467","123467","123467","123467","123467","20200202","20200202","123467","20200202","20200202","123467","20200202","20200202","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","12345.6","20120401","20130331","20130331","NULL","NULL","NULL","NULL","NULL","2023/05/09 20:39:15","com_prefc_med_base_mapper","2023/05/09 20:39:15","com_prefc_med_base_mapper"