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] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=83=87=E3=83=A2?= =?UTF-8?q?=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 # 未確認フラグ