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] =?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