diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py index 14a0dd59..a02f2965 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py @@ -683,6 +683,10 @@ class ComInstAttMapper(UltmarcTableMapper): return # 存在する場合はUpdate + self.queries.append(self.__make_update_query()) + return + + def __make_update_query(self): set_clauses = [] # DPC対象病院 if len(self.record.dpc_flag) > 0: @@ -690,9 +694,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('dpc_specday = :dpc_spec_day') set_clauses.append('dpc_cancelday = :dpc_cancel_day') if self.record.dpc_flag == '@': - self.query_parameter['dpc_flag'] = '' - self.query_parameter['dpc_spec_day'] = '' - self.query_parameter['dpc_cancel_day'] = '' + self.query_parameter['dpc_flag'] = None + self.query_parameter['dpc_spec_day'] = None + self.query_parameter['dpc_cancel_day'] = None # DPC準備病院 if len(self.record.predpc_flag) > 0: @@ -700,9 +704,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('predpc_specday = :predpc_spec_day') set_clauses.append('predpc_cancelday = :predpc_cancel_day') if self.record.predpc_flag == '@': - self.query_parameter['predpc_flag'] = '' - self.query_parameter['predpc_spec_day'] = '' - self.query_parameter['predpc_cancel_day'] = '' + self.query_parameter['predpc_flag'] = None + self.query_parameter['predpc_spec_day'] = None + self.query_parameter['predpc_cancel_day'] = None # がん診療連携拠点病院 if len(self.record.cancer_flag) > 0: @@ -710,9 +714,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('cancer_specday = :cancer_spec_day') set_clauses.append('cancer_cancelday = :cancer_cancel_day') if self.record.cancer_flag == '@': - self.query_parameter['cancer_flag'] = '' - self.query_parameter['cancer_spec_day'] = '' - self.query_parameter['cancer_cancel_day'] = '' + self.query_parameter['cancer_flag'] = None + self.query_parameter['cancer_spec_day'] = None + self.query_parameter['cancer_cancel_day'] = None # 特定機能病院 if len(self.record.funchp_flag) > 0: @@ -720,9 +724,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('funchpokdate = :funchp_ok_date') set_clauses.append('funchpcandate = :funchp_can_date') if self.record.funchp_flag == '@': - self.query_parameter['funchp_flag'] = '' - self.query_parameter['funchp_ok_date'] = '' - self.query_parameter['funchp_can_date'] = '' + self.query_parameter['funchp_flag'] = None + self.query_parameter['funchp_ok_date'] = None + self.query_parameter['funchp_can_date'] = None # 地域医療支援病院 if len(self.record.areasuphp_flag) > 0: @@ -731,10 +735,10 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('areasuphpokdate = :areasuphp_ok_date') set_clauses.append('areasuphpcandate = :areasuphp_can_date') if self.record.areasuphp_flag == '@': - self.query_parameter['areasuphp_flag'] = '' + self.query_parameter['areasuphp_flag'] = None self.query_parameter['areasuphp_intrate'] = None - self.query_parameter['areasuphp_ok_date'] = '' - self.query_parameter['areasuphp_can_date'] = '' + self.query_parameter['areasuphp_ok_date'] = None + self.query_parameter['areasuphp_can_date'] = None # 超急性期脳卒中加算 if len(self.record.acuthp_add_flag) > 0: @@ -742,9 +746,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('acuthpaddokdate = :acuthp_add_ok_date') set_clauses.append('acuthpaddcandate = :acuthp_add_can_date') if self.record.acuthp_add_flag == '@': - self.query_parameter['acuthp_add_flag'] = '' - self.query_parameter['acuthp_add_ok_date'] = '' - self.query_parameter['acuthp_add_can_date'] = '' + self.query_parameter['acuthp_add_flag'] = None + self.query_parameter['acuthp_add_ok_date'] = None + self.query_parameter['acuthp_add_can_date'] = None # 総合入院体制加算 if len(self.record.genadmisiion_flag) > 0: @@ -752,9 +756,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('genadmisiionfokdate = :genadmisiion_ok_date') set_clauses.append('genadmisiionfcandate = :genadmisiion_can_date') if self.record.genadmisiion_flag == '@': - self.query_parameter['genadmisiion_flag'] = '' - self.query_parameter['genadmisiion_ok_date'] = '' - self.query_parameter['genadmisiion_can_date'] = '' + self.query_parameter['genadmisiion_flag'] = None + self.query_parameter['genadmisiion_ok_date'] = None + self.query_parameter['genadmisiion_can_date'] = None # 医師事務作業補助体制加算 if len(self.record.assistance_flag) > 0: @@ -762,9 +766,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('assistanceokdate = :assistance_ok_date') set_clauses.append('assistancecandate = :assistance_can_date') if self.record.assistance_flag == '@': - self.query_parameter['assistance_flag'] = '' - self.query_parameter['assistance_ok_date'] = '' - self.query_parameter['assistance_can_date'] = '' + self.query_parameter['assistance_flag'] = None + self.query_parameter['assistance_ok_date'] = None + self.query_parameter['assistance_can_date'] = None # 診療録管理体制加算 if len(self.record.diagnosis_treatment_flag) > 0: @@ -772,9 +776,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('diagnosistreatment_specday = :diagnosis_treatment_spec_day') set_clauses.append('diagnosistreatment_cancelday = :diagnosis_treatment_cancel_day') if self.record.diagnosis_treatment_flag == '@': - self.query_parameter['diagnosis_treatment_flag'] = '' - self.query_parameter['diagnosis_treatment_spec_day'] = '' - self.query_parameter['diagnosis_treatment_cancel_day'] = '' + self.query_parameter['diagnosis_treatment_flag'] = None + self.query_parameter['diagnosis_treatment_spec_day'] = None + self.query_parameter['diagnosis_treatment_cancel_day'] = None # 医療安全対策加算 if len(self.record.safety_flag) > 0: @@ -782,9 +786,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('safety_specday = :safety_spec_day') set_clauses.append('safety_cancelday = :safety_cancel_day') if self.record.safety_flag == '@': - self.query_parameter['safety_flag'] = '' - self.query_parameter['safety_spec_day'] = '' - self.query_parameter['safety_cancel_day'] = '' + self.query_parameter['safety_flag'] = None + self.query_parameter['safety_spec_day'] = None + self.query_parameter['safety_cancel_day'] = None # 褥瘡ﾊｲﾘｽｸ患者ｹｱ加算 if len(self.record.highrisk_flag) > 0: @@ -792,9 +796,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('highrisk_specday = :highrisk_spec_day') set_clauses.append('highrisk_cancelday = :highrisk_cancel_day') if self.record.highrisk_flag == '@': - self.query_parameter['highrisk_flag'] = '' - self.query_parameter['highrisk_spec_day'] = '' - self.query_parameter['highrisk_cancel_day'] = '' + self.query_parameter['highrisk_flag'] = None + self.query_parameter['highrisk_spec_day'] = None + self.query_parameter['highrisk_cancel_day'] = None # 地域連携小児夜間･休日診療料 if len(self.record.infant_and_holiday_flag) > 0: @@ -802,9 +806,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('infantandholiday_specday = :infant_and_holiday_spec_day') set_clauses.append('infantandholiday_cancelday = :infant_and_holiday_cancel_day') if self.record.infant_and_holiday_flag == '@': - self.query_parameter['infant_and_holiday_flag'] = '' - self.query_parameter['infant_and_holiday_spec_day'] = '' - self.query_parameter['infant_and_holiday_cancel_day'] = '' + self.query_parameter['infant_and_holiday_flag'] = None + self.query_parameter['infant_and_holiday_spec_day'] = None + self.query_parameter['infant_and_holiday_cancel_day'] = None # 開放型病院 if len(self.record.ophp_flag) > 0: @@ -812,55 +816,26 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('ophpokdate = :ophpok_date') set_clauses.append('ophpcandate = :ophpcan_date') if self.record.ophp_flag == '@': - self.query_parameter['ophp_flag'] = '' - self.query_parameter['ophpok_date'] = '' - self.query_parameter['ophpcan_date'] = '' + self.query_parameter['ophp_flag'] = None + self.query_parameter['ophpok_date'] = None + self.query_parameter['ophpcan_date'] = None # 地域連携ｸﾘﾃｨｶﾙﾊﾟｽ if len(self.record.critical_flag) > 0: set_clauses.append('critical_flag = :critical_flag') - set_clauses.append('critical_code01 = :critical_code01') - set_clauses.append('critical_code02 = :critical_code02') - set_clauses.append('critical_code03 = :critical_code03') - set_clauses.append('critical_code04 = :critical_code04') - set_clauses.append('critical_code05 = :critical_code05') - set_clauses.append('critical_code06 = :critical_code06') - set_clauses.append('critical_code07 = :critical_code07') - set_clauses.append('critical_code08 = :critical_code08') - set_clauses.append('critical_code09 = :critical_code09') - set_clauses.append('critical_code10 = :critical_code10') - set_clauses.append('critical_code11 = :critical_code11') - set_clauses.append('critical_code12 = :critical_code12') - set_clauses.append('critical_code13 = :critical_code13') - set_clauses.append('critical_code14 = :critical_code14') - set_clauses.append('critical_code15 = :critical_code15') - set_clauses.append('critical_code16 = :critical_code16') - set_clauses.append('critical_code17 = :critical_code17') - set_clauses.append('critical_code18 = :critical_code18') - set_clauses.append('critical_code19 = :critical_code19') - set_clauses.append('critical_code20 = :critical_code20') + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i).zfill(2) # 2桁で0埋め + setting_item = 'critical_code' + num + ' = :critical_code' + num + set_clauses.append(setting_item) + if self.record.critical_flag == '@': - self.query_parameter['critical_flag'] = '' - self.query_parameter['critical_code01'] = '' - self.query_parameter['critical_code02'] = '' - self.query_parameter['critical_code03'] = '' - self.query_parameter['critical_code04'] = '' - self.query_parameter['critical_code05'] = '' - self.query_parameter['critical_code06'] = '' - self.query_parameter['critical_code07'] = '' - self.query_parameter['critical_code08'] = '' - self.query_parameter['critical_code09'] = '' - self.query_parameter['critical_code10'] = '' - self.query_parameter['critical_code11'] = '' - self.query_parameter['critical_code12'] = '' - self.query_parameter['critical_code13'] = '' - self.query_parameter['critical_code14'] = '' - self.query_parameter['critical_code15'] = '' - self.query_parameter['critical_code16'] = '' - self.query_parameter['critical_code17'] = '' - self.query_parameter['critical_code18'] = '' - self.query_parameter['critical_code19'] = '' - self.query_parameter['critical_code20'] = '' + self.query_parameter['critical_flag'] = None + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i).zfill(2) + setting_item = 'critical_code' + num + self.query_parameter[setting_item] = None # 薬剤管理指導料 if len(self.record.drgmgthp_flag) > 0: @@ -868,9 +843,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('drgmgthpokdate = :drgmgthp_ok_date') set_clauses.append('drgmgthpcandate = :drgmgthp_can_date') if self.record.drgmgthp_flag == '@': - self.query_parameter['drgmgthp_flag'] = '' - self.query_parameter['drgmgthp_ok_date'] = '' - self.query_parameter['drgmgthp_can_date'] = '' + self.query_parameter['drgmgthp_flag'] = None + self.query_parameter['drgmgthp_ok_date'] = None + self.query_parameter['drgmgthp_can_date'] = None # 画像診断管理加算 if len(self.record.image_diagnosis_flag) > 0: @@ -878,9 +853,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('imagediagnosis_specifiedday = :image_diagnosis_specified_day') set_clauses.append('imagediagnosis_cancelday = :image_diagnosis_cancel_day') if self.record.image_diagnosis_flag == '@': - self.query_parameter['image_diagnosis_flag'] = '' - self.query_parameter['image_diagnosis_specified_day'] = '' - self.query_parameter['image_diagnosis_cancel_day'] = '' + self.query_parameter['image_diagnosis_flag'] = None + self.query_parameter['image_diagnosis_specified_day'] = None + self.query_parameter['image_diagnosis_cancel_day'] = None # 外来化学療法加算 if len(self.record.chemotherapy_flag) > 0: @@ -888,9 +863,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('chemotherapy_specday = :chemotherapy_spec_day') set_clauses.append('chemotherapy_cancelday = :chemotherapy_cancel_day') if self.record.chemotherapy_flag == '@': - self.query_parameter['chemotherapy_flag'] = '' - self.query_parameter['chemotherapy_spec_day'] = '' - self.query_parameter['chemotherapy_cancel_day'] = '' + self.query_parameter['chemotherapy_flag'] = None + self.query_parameter['chemotherapy_spec_day'] = None + self.query_parameter['chemotherapy_cancel_day'] = None # 疾患別ﾘﾊﾋﾞﾘﾃｰｼｮﾝ料 if len(self.record.rehabilitation_flag) > 0: @@ -906,17 +881,17 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('rehabilitation_code09= :rehabilitation_code09') set_clauses.append('rehabilitation_code10= :rehabilitation_code10') if self.record.rehabilitation_flag == '@': - self.query_parameter['rehabilitation_flag'] = '' - self.query_parameter['rehabilitation_code01'] = '' - self.query_parameter['rehabilitation_code02'] = '' - self.query_parameter['rehabilitation_code03'] = '' - self.query_parameter['rehabilitation_code04'] = '' - self.query_parameter['rehabilitation_code05'] = '' - self.query_parameter['rehabilitation_code06'] = '' - self.query_parameter['rehabilitation_code07'] = '' - self.query_parameter['rehabilitation_code08'] = '' - self.query_parameter['rehabilitation_code09'] = '' - self.query_parameter['rehabilitation_code10'] = '' + self.query_parameter['rehabilitation_flag'] = None + self.query_parameter['rehabilitation_code01'] = None + self.query_parameter['rehabilitation_code02'] = None + self.query_parameter['rehabilitation_code03'] = None + self.query_parameter['rehabilitation_code04'] = None + self.query_parameter['rehabilitation_code05'] = None + self.query_parameter['rehabilitation_code06'] = None + self.query_parameter['rehabilitation_code07'] = None + self.query_parameter['rehabilitation_code08'] = None + self.query_parameter['rehabilitation_code09'] = None + self.query_parameter['rehabilitation_code10'] = None # 麻酔管理料 if len(self.record.anesthetizing_manage_flag) > 0: @@ -924,9 +899,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('anesthetizingmanage_specday = :anesthetizing_manage_spec_day') set_clauses.append('anesthetizingmanage_cancelday = :anesthetizing_manage_can_day') if self.record.anesthetizing_manage_flag == '@': - self.query_parameter['anesthetizing_manage_flag'] = '' - self.query_parameter['anesthetizing_manage_spec_day'] = '' - self.query_parameter['anesthetizing_manage_can_day'] = '' + self.query_parameter['anesthetizing_manage_flag'] = None + self.query_parameter['anesthetizing_manage_spec_day'] = None + self.query_parameter['anesthetizing_manage_can_day'] = None # 在宅療養支援病院･診療所 if len(self.record.home_recuperation_flag) > 0: @@ -934,9 +909,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('homerecuperation_specday = :home_recuperation_spec_day') set_clauses.append('homerecuperation_cancelday = :home_recuperation_cancel_day') if self.record.home_recuperation_flag == '@': - self.query_parameter['home_recuperation_flag'] = '' - self.query_parameter['home_recuperation_spec_day'] = '' - self.query_parameter['home_recuperation_cancel_day'] = '' + self.query_parameter['home_recuperation_flag'] = None + self.query_parameter['home_recuperation_spec_day'] = None + self.query_parameter['home_recuperation_cancel_day'] = None # 在宅時医学総合管理料 if len(self.record.synthesis_when_staying_flag) > 0: @@ -944,9 +919,9 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('synthesiswhenstaying_specday = :synthesis_when_staying_spec_day') set_clauses.append('synthesiswhenstaying_cancelday = :synthesis_when_staying_can_day') if self.record.synthesis_when_staying_flag == '@': - self.query_parameter['synthesis_when_staying_flag'] = '' - self.query_parameter['synthesis_when_staying_spec_day'] = '' - self.query_parameter['synthesis_when_staying_can_day'] = '' + self.query_parameter['synthesis_when_staying_flag'] = None + self.query_parameter['synthesis_when_staying_spec_day'] = None + self.query_parameter['synthesis_when_staying_can_day'] = None # 在宅末期医療総合診療料 if len(self.record.home_late_flag) > 0: @@ -954,21 +929,21 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('homelateokday = :home_late_ok_day') set_clauses.append('homelatecanday = :home_late_can_day') if self.record.home_late_flag == '@': - self.query_parameter['home_late_flag'] = '' - self.query_parameter['home_late_ok_day'] = '' - self.query_parameter['home_late_can_day'] = '' + self.query_parameter['home_late_flag'] = None + self.query_parameter['home_late_ok_day'] = None + self.query_parameter['home_late_can_day'] = None # ｹｱﾐｯｸｽ区分 if len(self.record.caremix_kind) > 0: set_clauses.append('caremixkind = :caremix_kind') if self.record.caremix_kind == '@': - self.query_parameter['caremix_kind'] = '' + self.query_parameter['caremix_kind'] = None # 完全型･移行型区分 if len(self.record.fullmove_flag) > 0: set_clauses.append('fullmoveflag = :fullmove_flag') if self.record.fullmove_flag == '@': - self.query_parameter['fullmove_flag'] = '' + self.query_parameter['fullmove_flag'] = None # 療養型病床群 if sum(len(item) for item in self.record.resthp_items) > 0: @@ -983,15 +958,15 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('resthpcarecandate = :resthp_care_can_date') set_clauses.append('resthpsbednum = :resthp_sbed_num') if self.record.resthp_flag == '@': - self.query_parameter['resthp_flag'] = '' - self.query_parameter['resthp_care_kind'] = '' + self.query_parameter['resthp_flag'] = None + self.query_parameter['resthp_care_kind'] = None self.query_parameter['resthp_bed_num'] = None - self.query_parameter['resthp_ok_date'] = '' - self.query_parameter['resthp_can_date'] = '' - self.query_parameter['resthp_care_nrs_kind'] = '' + self.query_parameter['resthp_ok_date'] = None + self.query_parameter['resthp_can_date'] = None + self.query_parameter['resthp_care_nrs_kind'] = None self.query_parameter['resthp_care_bed_num'] = None - self.query_parameter['resthp_care_ok_date'] = '' - self.query_parameter['resthp_care_can_date'] = '' + self.query_parameter['resthp_care_ok_date'] = None + self.query_parameter['resthp_care_can_date'] = None self.query_parameter['resthp_sbed_num'] = None # 一般病棟 @@ -1000,8 +975,8 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('nrmhpcarekind = :nrmhp_care_kind') set_clauses.append('nrmhpbedtotalnum = :nrmhp_bed_total_num') if self.record.nrmhp_flag == '@': - self.query_parameter['nrmhp_flag'] = '' - self.query_parameter['nrmhp_care_kind'] = '' + self.query_parameter['nrmhp_flag'] = None + self.query_parameter['nrmhp_care_kind'] = None self.query_parameter['nrmhp_bed_total_num'] = None # 精神病棟 @@ -1010,8 +985,8 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('menthpcarekind = :menthp_care_kind') set_clauses.append('menthpbednum = :menthp_bed_num') if self.record.menthp_flag == '@': - self.query_parameter['menthp_flag'] = '' - self.query_parameter['menthp_care_kind'] = '' + self.query_parameter['menthp_flag'] = None + self.query_parameter['menthp_care_kind'] = None self.query_parameter['menthp_bed_num'] = None # 結核病棟 @@ -1020,8 +995,8 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('tubhpcarekind = :tubhp_care_kind') set_clauses.append('tubhpbednum = :tubhp_bed_num') if self.record.tubhp_flag == '@': - self.query_parameter['tubhp_flag'] = '' - self.query_parameter['tubhp_care_kind'] = '' + self.query_parameter['tubhp_flag'] = None + self.query_parameter['tubhp_care_kind'] = None self.query_parameter['tubhp_bed_num'] = None # 感染症指定医療機関 @@ -1030,16 +1005,16 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('infhpflag1 = :infhp_flag1') set_clauses.append('infhpflag2 = :infhp_flag2') if self.record.infhp_flag == '@': - self.query_parameter['infhp_flag'] = '' - self.query_parameter['infhp_flag1'] = '' - self.query_parameter['infhp_flag2'] = '' + self.query_parameter['infhp_flag'] = None + self.query_parameter['infhp_flag1'] = None + self.query_parameter['infhp_flag2'] = None # 感染症病床 if len(self.record.infhp_bed_flag) > 0: set_clauses.append('infhpbedflag = :infhp_bed_flag') set_clauses.append('infhpbednum = :infhp_bed_num') if self.record.infhp_bed_flag == '@': - self.query_parameter['infhp_bed_flag'] = '' + self.query_parameter['infhp_bed_flag'] = None self.query_parameter['infhp_bed_num'] = None # 緩和ｹｱ病棟設置病院 @@ -1049,10 +1024,10 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('hospiceokdate = :hospice_ok_date') set_clauses.append('hospicecandate = :hospice_can_date') if self.record.hospice_flag == '@': - self.query_parameter['hospice_flag'] = '' + self.query_parameter['hospice_flag'] = None self.query_parameter['hospice_bed_num'] = None - self.query_parameter['hospice_ok_date'] = '' - self.query_parameter['hospice_can_date'] = '' + self.query_parameter['hospice_ok_date'] = None + self.query_parameter['hospice_can_date'] = None # 医療機能評価 if len(self.record.hpfunce_st_flag) > 0: @@ -1061,10 +1036,10 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('hpfuncestokdate = :hpfunce_st_ok_date') set_clauses.append('hpfuncestcandate = :hpfunce_st_can_date') if self.record.hpfunce_st_flag == '@': - self.query_parameter['hpfunce_st_flag'] = '' - self.query_parameter['hpfunce_st_kind'] = '' - self.query_parameter['hpfunce_st_ok_date'] = '' - self.query_parameter['hpfunce_st_can_date'] = '' + self.query_parameter['hpfunce_st_flag'] = None + self.query_parameter['hpfunce_st_kind'] = None + self.query_parameter['hpfunce_st_ok_date'] = None + self.query_parameter['hpfunce_st_can_date'] = None # 臨床研修指定病院 if sum(len(item) for item in self.record.cl_items) > 0: @@ -1078,21 +1053,21 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('cldephpokdate = :cldephp_ok_date') set_clauses.append('cldephpcandate = :cldephp_can_date') if self.record.clolyhp_kind == '@': - self.query_parameter['clolyhp_kind'] = '' - self.query_parameter['clolyhp_ok_date'] = '' - self.query_parameter['clolyhp_can_date'] = '' - self.query_parameter['clhp_kind'] = '' - self.query_parameter['clhp_ok_date'] = '' - self.query_parameter['clhp_can_date'] = '' - self.query_parameter['cldephp_kind'] = '' - self.query_parameter['cldephp_ok_date'] = '' - self.query_parameter['cldephp_can_date'] = '' + self.query_parameter['clolyhp_kind'] = None + self.query_parameter['clolyhp_ok_date'] = None + self.query_parameter['clolyhp_can_date'] = None + self.query_parameter['clhp_kind'] = None + self.query_parameter['clhp_ok_date'] = None + self.query_parameter['clhp_can_date'] = None + self.query_parameter['cldephp_kind'] = None + self.query_parameter['cldephp_ok_date'] = None + self.query_parameter['cldephp_can_date'] = None # 災害拠点病院 if len(self.record.disasthp_flag) > 0: set_clauses.append('disasthpflag = :disasthp_flag') if self.record.disasthp_flag == '@': - self.query_parameter['disasthp_flag'] = '' + self.query_parameter['disasthp_flag'] = None # 救急医療 if len(self.record.d1emerhp_flag) > 0: @@ -1100,15 +1075,15 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('d2emerhpflag = :d2emerhp_flag') set_clauses.append('d3emerhpflag = :d3emerhp_flag') if self.record.d1emerhp_flag == '@': - self.query_parameter['d1emerhp_flag'] = '' - self.query_parameter['d2emerhp_flag'] = '' - self.query_parameter['d3emerhp_flag'] = '' + self.query_parameter['d1emerhp_flag'] = None + self.query_parameter['d2emerhp_flag'] = None + self.query_parameter['d3emerhp_flag'] = None # 救急告示診療所 if len(self.record.emergency_clinic) > 0: set_clauses.append('emergencyclinic = :emergency_clinic') if self.record.emergency_clinic == '@': - self.query_parameter['emergency_clinic'] = '' + self.query_parameter['emergency_clinic'] = None # 治験中核病院 if len(self.record.trial_core_flag) > 0: @@ -1117,10 +1092,10 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('trialcoreokdate = :trial_core_ok_date') set_clauses.append('trialcorecandate = :trial_core_can_date') if self.record.trial_core_flag == '@': - self.query_parameter['trial_core_flag'] = '' - self.query_parameter['trial_core_div'] = '' - self.query_parameter['trial_core_ok_date'] = '' - self.query_parameter['trial_core_can_date'] = '' + self.query_parameter['trial_core_flag'] = None + self.query_parameter['trial_core_div'] = None + self.query_parameter['trial_core_ok_date'] = None + self.query_parameter['trial_core_can_date'] = None # 認知症疾患医療ｾﾝﾀｰ if len(self.record.dementia_flag) > 0: @@ -1128,319 +1103,85 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('dementiaokdate = :dementia_okd_ate') set_clauses.append('dementiacandate = :dementia_can_date') if self.record.dementia_flag == '@': - self.query_parameter['dementia_flag'] = '' - self.query_parameter['dementia_okd_ate'] = '' - self.query_parameter['dementia_can_date'] = '' + self.query_parameter['dementia_flag'] = None + self.query_parameter['dementia_okd_ate'] = None + self.query_parameter['dementia_can_date'] = None # 特定健康診査実施機関 if len(self.record.sphealth_exploration) > 0: set_clauses.append('sphealth_exploration = :sphealth_exploration') if self.record.sphealth_exploration == '@': - self.query_parameter['sphealth_exploration'] = '' + self.query_parameter['sphealth_exploration'] = None # 特定保健指導実施機関 if len(self.record.sphealth_guidance) > 0: set_clauses.append('sphealth_guidance = :sphealth_guidance') if self.record.sphealth_guidance == '@': - self.query_parameter['sphealth_guidance'] = '' + self.query_parameter['sphealth_guidance'] = None # 先進医療実施医療機関 if len(self.record.hiadhp_flag) > 0: set_clauses.append('hiadhpflag = :hiadhp_flag') - set_clauses.append('hiadhpcode1 = :hiadhp_code1') - set_clauses.append('hiadhpkind1 = :hiadhp_kind1') - set_clauses.append('hiadhpcode2 = :hiadhp_code2') - set_clauses.append('hiadhpkind2 = :hiadhp_kind2') - set_clauses.append('hiadhpcode3 = :hiadhp_code3') - set_clauses.append('hiadhpkind3 = :hiadhp_kind3') - set_clauses.append('hiadhpcode4 = :hiadhp_code4') - set_clauses.append('hiadhpkind4 = :hiadhp_kind4') - set_clauses.append('hiadhpcode5 = :hiadhp_code5') - set_clauses.append('hiadhpkind5 = :hiadhp_kind5') - set_clauses.append('hiadhpcode6 = :hiadhp_code6') - set_clauses.append('hiadhpkind6 = :hiadhp_kind6') - set_clauses.append('hiadhpcode7 = :hiadhp_code7') - set_clauses.append('hiadhpkind7 = :hiadhp_kind7') - set_clauses.append('hiadhpcode8 = :hiadhp_code8') - set_clauses.append('hiadhpkind8 = :hiadhp_kind8') - set_clauses.append('hiadhpcode9 = :hiadhp_code9') - set_clauses.append('hiadhpkind9 = :hiadhp_kind9') - set_clauses.append('hiadhpcode10 = :hiadhp_code10') - set_clauses.append('hiadhpkind10 = :hiadhp_kind10') - set_clauses.append('hiadhpcode11 = :hiadhp_code11') - set_clauses.append('hiadhpkind11 = :hiadhp_kind11') - set_clauses.append('hiadhpcode12 = :hiadhp_code12') - set_clauses.append('hiadhpkind12 = :hiadhp_kind12') - set_clauses.append('hiadhpcode13 = :hiadhp_code13') - set_clauses.append('hiadhpkind13 = :hiadhp_kind13') - set_clauses.append('hiadhpcode14 = :hiadhp_code14') - set_clauses.append('hiadhpkind14 = :hiadhp_kind14') - set_clauses.append('hiadhpcode15 = :hiadhp_code15') - set_clauses.append('hiadhpkind15 = :hiadhp_kind15') - set_clauses.append('hiadhpcode16 = :hiadhp_code16') - set_clauses.append('hiadhpkind16 = :hiadhp_kind16') - set_clauses.append('hiadhpcode17 = :hiadhp_code17') - set_clauses.append('hiadhpkind17 = :hiadhp_kind17') - set_clauses.append('hiadhpcode18 = :hiadhp_code18') - set_clauses.append('hiadhpkind18 = :hiadhp_kind18') - set_clauses.append('hiadhpcode19 = :hiadhp_code19') - set_clauses.append('hiadhpkind19 = :hiadhp_kind19') - set_clauses.append('hiadhpcode20 = :hiadhp_code20') - set_clauses.append('hiadhpkind20 = :hiadhp_kind20') - set_clauses.append('hiadhpcode21 = :hiadhp_code21') - set_clauses.append('hiadhpkind21 = :hiadhp_kind21') - set_clauses.append('hiadhpcode22 = :hiadhp_code22') - set_clauses.append('hiadhpkind22 = :hiadhp_kind22') - set_clauses.append('hiadhpcode23 = :hiadhp_code23') - set_clauses.append('hiadhpkind23 = :hiadhp_kind23') - set_clauses.append('hiadhpcode24 = :hiadhp_code24') - set_clauses.append('hiadhpkind24 = :hiadhp_kind24') - set_clauses.append('hiadhpcode25 = :hiadhp_code25') - set_clauses.append('hiadhpkind25 = :hiadhp_kind25') - set_clauses.append('hiadhpcode26 = :hiadhp_code26') - set_clauses.append('hiadhpkind26 = :hiadhp_kind26') - set_clauses.append('hiadhpcode27 = :hiadhp_code27') - set_clauses.append('hiadhpkind27 = :hiadhp_kind27') - set_clauses.append('hiadhpcode28 = :hiadhp_code28') - set_clauses.append('hiadhpkind28 = :hiadhp_kind28') - set_clauses.append('hiadhpcode29 = :hiadhp_code29') - set_clauses.append('hiadhpkind29 = :hiadhp_kind29') - set_clauses.append('hiadhpcode30 = :hiadhp_code30') - set_clauses.append('hiadhpkind30 = :hiadhp_kind30') - set_clauses.append('hiadhpcode31 = :hiadhp_code31') - set_clauses.append('hiadhpkind31 = :hiadhp_kind31') - set_clauses.append('hiadhpcode32 = :hiadhp_code32') - set_clauses.append('hiadhpkind32 = :hiadhp_kind32') - set_clauses.append('hiadhpcode33 = :hiadhp_code33') - set_clauses.append('hiadhpkind33 = :hiadhp_kind33') - set_clauses.append('hiadhpcode34 = :hiadhp_code34') - set_clauses.append('hiadhpkind34 = :hiadhp_kind34') - set_clauses.append('hiadhpcode35 = :hiadhp_code35') - set_clauses.append('hiadhpkind35 = :hiadhp_kind35') - set_clauses.append('hiadhpcode36 = :hiadhp_code36') - set_clauses.append('hiadhpkind36 = :hiadhp_kind36') - set_clauses.append('hiadhpcode37 = :hiadhp_code37') - set_clauses.append('hiadhpkind37 = :hiadhp_kind37') - set_clauses.append('hiadhpcode38 = :hiadhp_code38') - set_clauses.append('hiadhpkind38 = :hiadhp_kind38') - set_clauses.append('hiadhpcode39 = :hiadhp_code39') - set_clauses.append('hiadhpkind39 = :hiadhp_kind39') - set_clauses.append('hiadhpcode40 = :hiadhp_code40') - set_clauses.append('hiadhpkind40 = :hiadhp_kind40') + # 40個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 41): + num = str(i) + setting_item = 'hiadhpcode' + num + ' = :hiadhp_code' + num + set_clauses.append(setting_item) + setting_item = 'hiadhpkind' + num + ' = :hiadhp_kind' + num + set_clauses.append(setting_item) + if self.record.hiadhp_flag == '@': - self.query_parameter['hiadhp_flag'] = '' - self.query_parameter['hiadhp_code1'] = '' - self.query_parameter['hiadhp_kind1'] = '' - self.query_parameter['hiadhp_code2'] = '' - self.query_parameter['hiadhp_kind2'] = '' - self.query_parameter['hiadhp_code3'] = '' - self.query_parameter['hiadhp_kind3'] = '' - self.query_parameter['hiadhp_code4'] = '' - self.query_parameter['hiadhp_kind4'] = '' - self.query_parameter['hiadhp_code5'] = '' - self.query_parameter['hiadhp_kind5'] = '' - self.query_parameter['hiadhp_code6'] = '' - self.query_parameter['hiadhp_kind6'] = '' - self.query_parameter['hiadhp_code7'] = '' - self.query_parameter['hiadhp_kind7'] = '' - self.query_parameter['hiadhp_code8'] = '' - self.query_parameter['hiadhp_kind8'] = '' - self.query_parameter['hiadhp_code9'] = '' - self.query_parameter['hiadhp_kind9'] = '' - self.query_parameter['hiadhp_code10'] = '' - self.query_parameter['hiadhp_kind10'] = '' - self.query_parameter['hiadhp_code11'] = '' - self.query_parameter['hiadhp_kind11'] = '' - self.query_parameter['hiadhp_code12'] = '' - self.query_parameter['hiadhp_kind12'] = '' - self.query_parameter['hiadhp_code13'] = '' - self.query_parameter['hiadhp_kind13'] = '' - self.query_parameter['hiadhp_code14'] = '' - self.query_parameter['hiadhp_kind14'] = '' - self.query_parameter['hiadhp_code15'] = '' - self.query_parameter['hiadhp_kind15'] = '' - self.query_parameter['hiadhp_code16'] = '' - self.query_parameter['hiadhp_kind16'] = '' - self.query_parameter['hiadhp_code17'] = '' - self.query_parameter['hiadhp_kind17'] = '' - self.query_parameter['hiadhp_code18'] = '' - self.query_parameter['hiadhp_kind18'] = '' - self.query_parameter['hiadhp_code19'] = '' - self.query_parameter['hiadhp_kind19'] = '' - self.query_parameter['hiadhp_code20'] = '' - self.query_parameter['hiadhp_kind20'] = '' - self.query_parameter['hiadhp_code21'] = '' - self.query_parameter['hiadhp_kind21'] = '' - self.query_parameter['hiadhp_code22'] = '' - self.query_parameter['hiadhp_kind22'] = '' - self.query_parameter['hiadhp_code23'] = '' - self.query_parameter['hiadhp_kind23'] = '' - self.query_parameter['hiadhp_code24'] = '' - self.query_parameter['hiadhp_kind24'] = '' - self.query_parameter['hiadhp_code25'] = '' - self.query_parameter['hiadhp_kind25'] = '' - self.query_parameter['hiadhp_code26'] = '' - self.query_parameter['hiadhp_kind26'] = '' - self.query_parameter['hiadhp_code27'] = '' - self.query_parameter['hiadhp_kind27'] = '' - self.query_parameter['hiadhp_code28'] = '' - self.query_parameter['hiadhp_kind28'] = '' - self.query_parameter['hiadhp_code29'] = '' - self.query_parameter['hiadhp_kind29'] = '' - self.query_parameter['hiadhp_code30'] = '' - self.query_parameter['hiadhp_kind30'] = '' - self.query_parameter['hiadhp_code31'] = '' - self.query_parameter['hiadhp_kind31'] = '' - self.query_parameter['hiadhp_code32'] = '' - self.query_parameter['hiadhp_kind32'] = '' - self.query_parameter['hiadhp_code33'] = '' - self.query_parameter['hiadhp_kind33'] = '' - self.query_parameter['hiadhp_code34'] = '' - self.query_parameter['hiadhp_kind34'] = '' - self.query_parameter['hiadhp_code35'] = '' - self.query_parameter['hiadhp_kind35'] = '' - self.query_parameter['hiadhp_code36'] = '' - self.query_parameter['hiadhp_kind36'] = '' - self.query_parameter['hiadhp_code37'] = '' - self.query_parameter['hiadhp_kind37'] = '' - self.query_parameter['hiadhp_code38'] = '' - self.query_parameter['hiadhp_kind38'] = '' - self.query_parameter['hiadhp_code39'] = '' - self.query_parameter['hiadhp_kind39'] = '' - self.query_parameter['hiadhp_code40'] = '' - self.query_parameter['hiadhp_kind40'] = '' + self.query_parameter['hiadhp_flag'] = None + + # 40個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 41): + num = str(i) + setting_item = 'hiadhp_code' + num + self.query_parameter[setting_item] = None + setting_item = 'hiadhp_kind' + num + self.query_parameter[setting_item] = None # 先端医療実施医療機関 if len(self.record.hitechhp_flag) > 0: set_clauses.append('hitechhpflag = :hitechhp_flag') - set_clauses.append('hitechhpkind1 = :hitechhp_kind1') - set_clauses.append('hitechhpkind2 = :hitechhp_kind2') - set_clauses.append('hitechhpkind3 = :hitechhp_kind3') - set_clauses.append('hitechhpkind4 = :hitechhp_kind4') - set_clauses.append('hitechhpkind5 = :hitechhp_kind5') - set_clauses.append('hitechhpkind6 = :hitechhp_kind6') - set_clauses.append('hitechhpkind7 = :hitechhp_kind7') - set_clauses.append('hitechhpkind8 = :hitechhp_kind8') - set_clauses.append('hitechhpkind9 = :hitechhp_kind9') - set_clauses.append('hitechhpkind10 = :hitechhp_kind10') - set_clauses.append('hitechhpkind11 = :hitechhp_kind11') - set_clauses.append('hitechhpkind12 = :hitechhp_kind12') - set_clauses.append('hitechhpkind13 = :hitechhp_kind13') - set_clauses.append('hitechhpkind14 = :hitechhp_kind14') - set_clauses.append('hitechhpkind15 = :hitechhp_kind15') - set_clauses.append('hitechhpkind16 = :hitechhp_kind16') - set_clauses.append('hitechhpkind17 = :hitechhp_kind17') - set_clauses.append('hitechhpkind18 = :hitechhp_kind18') - set_clauses.append('hitechhpkind19 = :hitechhp_kind19') - set_clauses.append('hitechhpkind20 = :hitechhp_kind20') + + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i) + setting_item = 'hitechhpkind' + num + ' = :hitechhp_kind' + num + set_clauses.append(setting_item) + if self.record.hitechhp_flag == '@': - self.query_parameter['hitechhp_flag'] = '' - self.query_parameter['hitechhp_kind1'] = '' - self.query_parameter['hitechhp_kind2'] = '' - self.query_parameter['hitechhp_kind3'] = '' - self.query_parameter['hitechhp_kind4'] = '' - self.query_parameter['hitechhp_kind5'] = '' - self.query_parameter['hitechhp_kind6'] = '' - self.query_parameter['hitechhp_kind7'] = '' - self.query_parameter['hitechhp_kind8'] = '' - self.query_parameter['hitechhp_kind9'] = '' - self.query_parameter['hitechhp_kind10'] = '' - self.query_parameter['hitechhp_kind11'] = '' - self.query_parameter['hitechhp_kind12'] = '' - self.query_parameter['hitechhp_kind13'] = '' - self.query_parameter['hitechhp_kind14'] = '' - self.query_parameter['hitechhp_kind15'] = '' - self.query_parameter['hitechhp_kind16'] = '' - self.query_parameter['hitechhp_kind17'] = '' - self.query_parameter['hitechhp_kind18'] = '' - self.query_parameter['hitechhp_kind19'] = '' - self.query_parameter['hitechhp_kind20'] = '' + self.query_parameter['hitechhp_flag'] = None + + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i) + setting_item = 'hitechhp_kind' + num + self.query_parameter[setting_item] = None # 政策医療 if len(self.record.policy_medical_flag) > 0: set_clauses.append('policymedical_flag = :policy_medical_flag') - set_clauses.append('policymedical_code01 = :policy_medical_code01') - set_clauses.append('policymedical_content01 = :policy_medical_content01') - set_clauses.append('policymedical_code02 = :policy_medical_code02') - set_clauses.append('policymedical_content02 = :policy_medical_content02') - set_clauses.append('policymedical_code03 = :policy_medical_code03') - set_clauses.append('policymedical_content03 = :policy_medical_content03') - set_clauses.append('policymedical_code04 = :policy_medical_code04') - set_clauses.append('policymedical_content04 = :policy_medical_content04') - set_clauses.append('policymedical_code05 = :policy_medical_code05') - set_clauses.append('policymedical_content05 = :policy_medical_content05') - set_clauses.append('policymedical_code06 = :policy_medical_code06') - set_clauses.append('policymedical_content06 = :policy_medical_content06') - set_clauses.append('policymedical_code07 = :policy_medical_code07') - set_clauses.append('policymedical_content07 = :policy_medical_content07') - set_clauses.append('policymedical_code08 = :policy_medical_code08') - set_clauses.append('policymedical_content08 = :policy_medical_content08') - set_clauses.append('policymedical_code09 = :policy_medical_code09') - set_clauses.append('policymedical_content09 = :policy_medical_content09') - set_clauses.append('policymedical_code10 = :policy_medical_code10') - set_clauses.append('policymedical_content10 = :policy_medical_content10') - set_clauses.append('policymedical_code11 = :policy_medical_code11') - set_clauses.append('policymedical_content11 = :policy_medical_content11') - set_clauses.append('policymedical_code12 = :policy_medical_code12') - set_clauses.append('policymedical_content12 = :policy_medical_content12') - set_clauses.append('policymedical_code13 = :policy_medical_code13') - set_clauses.append('policymedical_content13 = :policy_medical_content13') - set_clauses.append('policymedical_code14 = :policy_medical_code14') - set_clauses.append('policymedical_content14 = :policy_medical_content14') - set_clauses.append('policymedical_code15 = :policy_medical_code15') - set_clauses.append('policymedical_content15 = :policy_medical_content15') - set_clauses.append('policymedical_code16 = :policy_medical_code16') - set_clauses.append('policymedical_content16 = :policy_medical_content16') - set_clauses.append('policymedical_code17 = :policy_medical_code17') - set_clauses.append('policymedical_content17 = :policy_medical_content17') - set_clauses.append('policymedical_code18 = :policy_medical_code18') - set_clauses.append('policymedical_content18 = :policy_medical_content18') - set_clauses.append('policymedical_code19 = :policy_medical_code19') - set_clauses.append('policymedical_content19 = :policy_medical_content19') - set_clauses.append('policymedical_code20 = :policy_medical_code20') - set_clauses.append('policymedical_content20 = :policy_medical_content20') + + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i).zfill(2) # 2桁で0埋め + setting_item = 'policymedical_code' + num + ' = :policy_medical_code' + num + set_clauses.append(setting_item) + setting_item = 'policymedical_content' + num + ' = :policy_medical_content' + num + set_clauses.append(setting_item) + if self.record.policy_medical_flag == '@': - self.query_parameter['policy_medical_flag'] = '' - self.query_parameter['policy_medical_code01'] = '' - self.query_parameter['policy_medical_content01'] = '' - self.query_parameter['policy_medical_code02'] = '' - self.query_parameter['policy_medical_content02'] = '' - self.query_parameter['policy_medical_code03'] = '' - self.query_parameter['policy_medical_content03'] = '' - self.query_parameter['policy_medical_code04'] = '' - self.query_parameter['policy_medical_content04'] = '' - self.query_parameter['policy_medical_code05'] = '' - self.query_parameter['policy_medical_content05'] = '' - self.query_parameter['policy_medical_code06'] = '' - self.query_parameter['policy_medical_content06'] = '' - self.query_parameter['policy_medical_code07'] = '' - self.query_parameter['policy_medical_content07'] = '' - self.query_parameter['policy_medical_code08'] = '' - self.query_parameter['policy_medical_content08'] = '' - self.query_parameter['policy_medical_code09'] = '' - self.query_parameter['policy_medical_content09'] = '' - self.query_parameter['policy_medical_code10'] = '' - self.query_parameter['policy_medical_content10'] = '' - self.query_parameter['policy_medical_code11'] = '' - self.query_parameter['policy_medical_content11'] = '' - self.query_parameter['policy_medical_code12'] = '' - self.query_parameter['policy_medical_content12'] = '' - self.query_parameter['policy_medical_code13'] = '' - self.query_parameter['policy_medical_content13'] = '' - self.query_parameter['policy_medical_code14'] = '' - self.query_parameter['policy_medical_content14'] = '' - self.query_parameter['policy_medical_code15'] = '' - self.query_parameter['policy_medical_content15'] = '' - self.query_parameter['policy_medical_code16'] = '' - self.query_parameter['policy_medical_content16'] = '' - self.query_parameter['policy_medical_code17'] = '' - self.query_parameter['policy_medical_content17'] = '' - self.query_parameter['policy_medical_code18'] = '' - self.query_parameter['policy_medical_content18'] = '' - self.query_parameter['policy_medical_code19'] = '' - self.query_parameter['policy_medical_content19'] = '' - self.query_parameter['policy_medical_code20'] = '' - self.query_parameter['policy_medical_content20'] = '' + self.query_parameter['policy_medical_flag'] = None + + # 20個分の項目設定(rangeの第2引数の数字はループに含まれないため、+1を指定する) + for i in range(1, 21): + num = str(i).zfill(2) # 2桁で0埋め + setting_item = 'policy_medical_code' + num + self.query_parameter[setting_item] = None + setting_item = 'policy_medical_content' + num + self.query_parameter[setting_item] = None # 訪問看護ステーション if len(self.record.visitcarest_flag) > 0: @@ -1449,27 +1190,25 @@ class ComInstAttMapper(UltmarcTableMapper): set_clauses.append('visitcarestation_code = :visitcarestation_code') set_clauses.append('visitcarestation_yobi = :visitcarestation_yobi') if self.record.visitcarest_flag == '@': - self.query_parameter['visitcarest_flag'] = '' - self.query_parameter['visitcarestation_id'] = '' - self.query_parameter['visitcarestation_code'] = '' - self.query_parameter['visitcarestation_yobi'] = '' + self.query_parameter['visitcarest_flag'] = None + self.query_parameter['visitcarestation_id'] = None + self.query_parameter['visitcarestation_code'] = None + self.query_parameter['visitcarestation_yobi'] = None # 開設年月 if len(self.record.open_date) > 0: set_clauses.append('opendate = :open_date') if self.record.open_date == '@': - self.query_parameter['open_date'] = '' + self.query_parameter['open_date'] = None update_columns = ','.join(set_clauses) # 何も更新項目が無い場合はNoneとする（更新処理は行わない） if len(update_columns) == 0: - self.queries.append(None) + return None else: # 末尾にカンマを付けてSET句を完成させる update_columns += ',' update_query = self.UPDATE_QUERY.format( update_columns=update_columns ) - self.queries.append(update_query) - - return + return update_query diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_att.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_att.py index 77ec6cf6..90f02cd2 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_att.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_att.py @@ -19,7 +19,7 @@ class ComInstAtt(UltmarcTable): funchp_ok_date: str # 特定機能病院承認年月日 funchp_can_date: str # 特定機能病院取消年月日 areasuphp_flag: str # 地域医療支援病院ﾌﾗｸﾞ - areasuphp_intrate: str # 地域医療支援病院紹介率 ※ + areasuphp_intrate: str # 地域医療支援病院紹介率 areasuphp_ok_date: str # 地域医療支援病院承認年月日 areasuphp_can_date: str # 地域医療支援病院取消年月日 acuthp_add_flag: str # 超急性期脳卒中加算ﾌﾗｸﾞ @@ -103,30 +103,30 @@ class ComInstAtt(UltmarcTable): fullmove_flag: str # 完全型･移行型区分 resthp_flag: str # 療養型病床群ﾌﾗｸﾞ resthp_care_kind: str # 療養型病床群_医療型（看護種別） - resthp_bed_num: str # 療養型病床群_医療型（病床数） ※ + resthp_bed_num: str # 療養型病床群_医療型（病床数） resthp_ok_date: str # 療養型病床群_医療型（承認年月日） resthp_can_date: str # 療養型病床群_医療型（取消年月日） resthp_care_nrs_kind: str # 療養型病床群_介護型（看護種別） - resthp_care_bed_num: str # 療養型病床群_介護型（病床数） ※ + resthp_care_bed_num: str # 療養型病床群_介護型（病床数） resthp_care_ok_date: str # 療養型病床群_介護型（承認年月日） resthp_care_can_date: str # 療養型病床群_介護型（取消年月日） - resthp_sbed_num: str # 療養型病床群_稼動数合計（病床数） ※ + resthp_sbed_num: str # 療養型病床群_稼動数合計（病床数） nrmhp_flag: str # 一般病棟ﾌﾗｸﾞ nrmhp_care_kind: str # 一般病棟看護種別 - nrmhp_bed_total_num: str # 一般病棟病床数 ※ + nrmhp_bed_total_num: str # 一般病棟病床数 menthp_flag: str # 精神病棟ﾌﾗｸﾞ menthp_care_kind: str # 精神病棟看護種別 - menthp_bed_num: str # 精神病棟病床数 ※ + menthp_bed_num: str # 精神病棟病床数 tubhp_flag: str # 結核病棟ﾌﾗｸﾞ tubhp_care_kind: str # 結核病棟看護種別 - tubhp_bed_num: str # 結核病棟病床数 ※ + tubhp_bed_num: str # 結核病棟病床数 infhp_flag: str # 感染症特定 infhp_flag1: str # 感染症1種 infhp_flag2: str # 感染症2種 infhp_bed_flag: str # 感染症病床ﾌﾗｸﾞ - infhp_bed_num: str # 感染症病床病床数 ※ + infhp_bed_num: str # 感染症病床病床数 hospice_flag: str # 緩和ｹｱ病棟設置病院ﾌﾗｸﾞ - hospice_bed_num: str # 緩和ｹｱ病棟設置病院病床数 ※ + hospice_bed_num: str # 緩和ｹｱ病棟設置病院病床数 hospice_ok_date: str # 緩和ｹｱ病棟設置病院承認年月日 hospice_can_date: str # 緩和ｹｱ病棟設置病院取消年月日 hpfunce_st_flag: str # 医療機能評価ﾌﾗｸﾞ diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/expect_com_inst_att_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/expect_com_inst_att_update.csv index 25a65dba..ecb59fbf 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/expect_com_inst_att_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/expect_com_inst_att_update.csv @@ -1,6 +1,7 @@ "dcf_dsf_inst_cd","dpc_flag","dpc_specday","dpc_cancelday","predpc_flag","predpc_specday","predpc_cancelday","cancer_flag","cancer_specday","cancer_cancelday","funchpflag","funchpokdate","funchpcandate","areasuphpflag","areasuphpintrate","areasuphpokdate","areasuphpcandate","acuthpaddflag","acuthpaddokdate","acuthpaddcandate","genadmisiionflag","genadmisiionfokdate","genadmisiionfcandate","assistanceflag","assistanceokdate","assistancecandate","diagnosistreatment_flag","diagnosistreatment_specday","diagnosistreatment_cancelday","safety_flag","safety_specday","safety_cancelday","highrisk_flag","highrisk_specday","highrisk_cancelday","infantandholiday_flag","infantandholiday_specday","infantandholiday_cancelday","ophpflag","ophpokdate","ophpcandate","critical_flag","critical_code01","critical_code02","critical_code03","critical_code04","critical_code05","critical_code06","critical_code07","critical_code08","critical_code09","critical_code10","critical_code11","critical_code12","critical_code13","critical_code14","critical_code15","critical_code16","critical_code17","critical_code18","critical_code19","critical_code20","drgmgthpflag","drgmgthpokdate","drgmgthpcandate","imagediagnosis_flag","imagediagnosis_specifiedday","imagediagnosis_cancelday","chemotherapy_flag","chemotherapy_specday","chemotherapy_cancelday","rehabilitation_flag","rehabilitation_code01","rehabilitation_code02","rehabilitation_code03","rehabilitation_code04","rehabilitation_code05","rehabilitation_code06","rehabilitation_code07","rehabilitation_code08","rehabilitation_code09","rehabilitation_code10","anesthetizingmanage_flag","anesthetizingmanage_specday","anesthetizingmanage_cancelday","homerecuperation_flag","homerecuperation_specday","homerecuperation_cancelday","synthesiswhenstaying_flag","synthesiswhenstaying_specday","synthesiswhenstaying_cancelday","homelateflag","homelateokday","homelatecanday","caremixkind","fullmoveflag","resthpflag","resthpcarekind","resthpbednum","resthpokdate","resthpcandate","resthpcarenrskind","resthpcarebednum","resthpcareokdate","resthpcarecandate","resthpsbednum","nrmhpflag","nrmhpcarekind","nrmhpbedtotalnum","menthpflag","menthpcarekind","menthpbednum","tubhpflag","tubhpcarekind","tubhpbednum","infhpflag","infhpflag1","infhpflag2","infhpbedflag","infhpbednum","hospiceflag","hospicebednum","hospiceokdate","hospicecandate","hpfuncestflag","hpfuncestkind","hpfuncestokdate","hpfuncestcandate","clolyhpkind","clolyhpokdate","clolyhpcandate","clhpkind","clhpokdate","clhpcandate","cldephpkind","cldephpokdate","cldephpcandate","disasthpflag","d1emerhpflag","d2emerhpflag","d3emerhpflag","emergencyclinic","trialcoreflag","trialcore_div","trialcoreokdate","trialcorecandate","dementiaflag","dementiaokdate","dementiacandate","sphealth_exploration","sphealth_guidance","hiadhpflag","hiadhpcode1","hiadhpkind1","hiadhpcode2","hiadhpkind2","hiadhpcode3","hiadhpkind3","hiadhpcode4","hiadhpkind4","hiadhpcode5","hiadhpkind5","hiadhpcode6","hiadhpkind6","hiadhpcode7","hiadhpkind7","hiadhpcode8","hiadhpkind8","hiadhpcode9","hiadhpkind9","hiadhpcode10","hiadhpkind10","hiadhpcode11","hiadhpkind11","hiadhpcode12","hiadhpkind12","hiadhpcode13","hiadhpkind13","hiadhpcode14","hiadhpkind14","hiadhpcode15","hiadhpkind15","hiadhpcode16","hiadhpkind16","hiadhpcode17","hiadhpkind17","hiadhpcode18","hiadhpkind18","hiadhpcode19","hiadhpkind19","hiadhpcode20","hiadhpkind20","hiadhpcode21","hiadhpkind21","hiadhpcode22","hiadhpkind22","hiadhpcode23","hiadhpkind23","hiadhpcode24","hiadhpkind24","hiadhpcode25","hiadhpkind25","hiadhpcode26","hiadhpkind26","hiadhpcode27","hiadhpkind27","hiadhpcode28","hiadhpkind28","hiadhpcode29","hiadhpkind29","hiadhpcode30","hiadhpkind30","hiadhpcode31","hiadhpkind31","hiadhpcode32","hiadhpkind32","hiadhpcode33","hiadhpkind33","hiadhpcode34","hiadhpkind34","hiadhpcode35","hiadhpkind35","hiadhpcode36","hiadhpkind36","hiadhpcode37","hiadhpkind37","hiadhpcode38","hiadhpkind38","hiadhpcode39","hiadhpkind39","hiadhpcode40","hiadhpkind40","hitechhpflag","hitechhpkind1","hitechhpkind2","hitechhpkind3","hitechhpkind4","hitechhpkind5","hitechhpkind6","hitechhpkind7","hitechhpkind8","hitechhpkind9","hitechhpkind10","hitechhpkind11","hitechhpkind12","hitechhpkind13","hitechhpkind14","hitechhpkind15","hitechhpkind16","hitechhpkind17","hitechhpkind18","hitechhpkind19","hitechhpkind20","policymedical_flag","policymedical_code01","policymedical_content01","policymedical_code02","policymedical_content02","policymedical_code03","policymedical_content03","policymedical_code04","policymedical_content04","policymedical_code05","policymedical_content05","policymedical_code06","policymedical_content06","policymedical_code07","policymedical_content07","policymedical_code08","policymedical_content08","policymedical_code09","policymedical_content09","policymedical_code10","policymedical_content10","policymedical_code11","policymedical_content11","policymedical_code12","policymedical_content12","policymedical_code13","policymedical_content13","policymedical_code14","policymedical_content14","policymedical_code15","policymedical_content15","policymedical_code16","policymedical_content16","policymedical_code17","policymedical_content17","policymedical_code18","policymedical_content18","policymedical_code19","policymedical_content19","policymedical_code20","policymedical_content20","visitcarestflag","visitcarestation_id","visitcarestation_code","visitcarestation_yobi","opendate","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"009900631","1","20171009","","1","2017","20171009","","","","","","","","NULL","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","19971001","","","","","","","","","","","","","","","","NULL","","","NULL","","","NULL","","","","","NULL","","NULL","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","3","","","","","","","","","","","","","","","","","","","","1","1","2","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","0","12","","20","","20171008","20171011","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComInstAtt","2023/05/09 10:39:02","com_inst_att_mapper" +"009900631","1","20171009","","1","2017","20171009","","","","","","","","NULL","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","NULL","NULL","NULL","NULL","NULL","NULL","1","19971001","","","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","","","NULL","","","NULL","","","NULL","","","","","NULL","","NULL","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","3","","","","","","","","","","","","","","","","","","","","1","1","2","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","0","12","","20","","20171008","20171011","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComInstAtt","2023/05/09 10:39:02","com_inst_att_mapper" "009901649","","","","1","2009","20171010","","","","","","","","NULL","","","","","","","","","1","20121201","","1","20080901","","","","20080331","","","","","","","1","20080701","","1","99","","","","","","","","","","","","","","","","","","","","1","20100401","","","","","","","","1","01","02","03","","","","","","","","1","19970701","","1","20130101","","1","20060401","","","","","1","9","1","I001","43","20061001","","","NULL","","","43","1","B999","120","","","NULL","","","NULL","","","","","NULL","","NULL","","","1","12","20131101","","","","","","","","","","","","1","1","","","","","","","","","","1","1","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","1","11","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","201710","20171008","20171011","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComInstAtt","2023/05/09 10:39:02","com_inst_att_mapper" -"009990146","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","20171009","20171011","NULL","NULL","NULL","NULL","2017/10/09 18:31:09","clsComInstAtt","2023/05/09 10:39:02","com_inst_att_mapper" +"009990146","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","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","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","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","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","20171008","20171011","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComInstAtt","2023/05/09 10:39:02","com_inst_att_mapper" "12345678999","9","20230510","20230511","2","2023","20230514","5","20230516","20230517","8","20230519","20230520","1","22.1","20230523","20230524","5","20230526","20230527","8","20230529","20230530","1","20230502","20230503","4","20230505","20230506","7","20230508","20230509","0","20230501","20230402","3","20230404","20230405","6","20230407","20230408","9","50","51","52","53","54","55","56","57","58","59","60","61","62","63","64","65","66","67","68","69","0","20230701","20230702","3","20230704","20230705","6","20230707","20230708","9","80","81","82","83","84","85","86","87","88","89","0","20230901","20230902","3","20230904","20230905","6","20230907","20230908","9","20231001","20231011","2","3","4","105","106","20231007","20231008","109","110","20231101","20231102","113","4","0115","116","7","0118","119","0","0121","122","3","4","5","6","127","8","129","20230130","20230131","2","33","20230104","20230105","6","20230107","20230108","9","20230104","20230101","2","20230103","20230104","5","6","7","8","9","0","1","20230102","20230403","4","20230105","20230106","7","8","9","160","1","162","3","164","5","166","7","168","9","170","1","172","3","174","5","176","7","178","9","180","1","182","3","184","5","186","7","188","9","190","1","192","3","194","5","196","7","198","9","200","1","202","3","204","5","206","7","208","9","210","1","212","3","214","5","216","7","218","9","220","1","222","3","224","5","226","7","228","9","230","1","232","3","234","5","236","7","238","9","0","41","42","43","44","45","46","47","48","49","50","51","52","53","54","55","56","57","58","59","60","1","62","3","64","5","66","7","68","9","70","1","72","3","74","5","76","7","78","9","80","1","82","3","84","5","86","7","88","9","90","1","92","3","94","5","96","7","98","9","00","1","2","3","0000304","05","202303","20171009","20230509","NULL","NULL","NULL","NULL","2017/10/09 18:31:09","clsComInstAtt","2023/05/09 10:10:10","com_inst_att_mapper" "99999999999","9","20230510","20230511","2","2023","20230514","5","20230516","20230517","8","20230519","20230520","1","22.1","20230523","20230524","5","20230526","20230527","8","20230529","20230530","1","20230502","20230503","4","20230505","20230506","7","20230508","20230509","0","20230501","20230402","3","20230404","20230405","6","20230407","20230408","9","50","51","52","53","54","55","56","57","58","59","60","61","62","63","64","65","66","67","68","69","0","20230701","20230702","3","20230704","20230705","6","20230707","20230708","9","80","81","82","83","84","85","86","87","88","89","0","20230901","20230902","3","20230904","20230905","6","20230907","20230908","9","20231001","20231011","2","3","4","105","106","20231007","20231008","109","110","20231101","20231102","113","4","0115","116","7","0118","119","0","0121","122","3","4","5","6","127","8","129","20230130","20230131","2","33","20230104","20230105","6","20230107","20230108","9","20230104","20230101","2","20230103","20230104","5","6","7","8","9","0","1","20230102","20230403","4","20230105","20230106","7","8","9","160","1","162","3","164","5","166","7","168","9","170","1","172","3","174","5","176","7","178","9","180","1","182","3","184","5","186","7","188","9","190","1","192","3","194","5","196","7","198","9","200","1","202","3","204","5","206","7","208","9","210","1","212","3","214","5","216","7","218","9","220","1","222","3","224","5","226","7","228","9","230","1","232","3","234","5","236","7","238","9","0","41","42","43","44","45","46","47","48","49","50","51","52","53","54","55","56","57","58","59","60","1","62","3","64","5","66","7","68","9","70","1","72","3","74","5","76","7","78","9","80","1","82","3","84","5","86","7","88","9","90","1","92","3","94","5","96","7","98","9","00","1","2","3","0000304","05","202303","20171009","20230509","NULL","NULL","NULL","NULL","2017/10/09 18:31:09","aaaa","2023/05/09 10:10:10","aaaa" + diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py index f54f641c..0721905d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py @@ -86,7 +86,7 @@ class TestComInstAttMapper: actual_select_sql = f"SELECT * FROM src05.com_inst_att WHERE dcf_dsf_inst_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'] + self.smallint_columns + ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date'] + self.smallint_columns assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0