NULL対応（作業中）
This commit is contained in:
野間
parent
873199f082
commit
e625a030c7
@ -248,13 +248,13 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
if len(self.record.drdel_code) > 0:
|
||||
set_clauses.append('delete_sche_reason_cd = :drdel_code')
|
||||
if self.record.drdel_code == '@':
|
||||
self.query_parameter['drdel_code'] = ''
|
||||
self.query_parameter['drdel_code'] = None
|
||||
|
||||
# 重複時相手先ｺｰﾄﾞ
|
||||
if len(self.record.opp_dup_code) > 0:
|
||||
set_clauses.append('opp_dup_cd = :opp_dup_code')
|
||||
if self.record.reptdr_id == '@':
|
||||
self.query_parameter['opp_dup_code'] = ''
|
||||
self.query_parameter['opp_dup_code'] = None
|
||||
|
||||
# 医師名(漢字)
|
||||
if len(self.record.dr_name) > 0:
|
||||
@ -276,11 +276,11 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
set_clauses.append('birthday_day = :birthday_day')
|
||||
set_clauses.append('birthday = :birth_day')
|
||||
if self.record.birthday_era == '@':
|
||||
self.query_parameter['birthday_era'] = ''
|
||||
self.query_parameter['birthday_year'] = ''
|
||||
self.query_parameter['birthday_month'] = ''
|
||||
self.query_parameter['birthday_day'] = ''
|
||||
self.query_parameter['birth_day'] = ''
|
||||
self.query_parameter['birthday_era'] = None
|
||||
self.query_parameter['birthday_year'] = None
|
||||
self.query_parameter['birthday_month'] = None
|
||||
self.query_parameter['birthday_day'] = None
|
||||
self.query_parameter['birth_day'] = None
|
||||
|
||||
# 出身都道府県ｺｰﾄﾞ
|
||||
if len(self.record.home_town_code) > 0:
|
||||
@ -296,9 +296,9 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
set_clauses.append('grad_era = :grad_yearera')
|
||||
set_clauses.append('grad_y = :grad_y')
|
||||
if self.record.grad_yearera == '@':
|
||||
self.query_parameter['grad_yearera'] = ''
|
||||
self.query_parameter['grad_year'] = ''
|
||||
self.query_parameter['grad_y'] = ''
|
||||
self.query_parameter['grad_yearera'] = None
|
||||
self.query_parameter['grad_year'] = None
|
||||
self.query_parameter['grad_y'] = None
|
||||
|
||||
# 出身校ｺｰﾄﾞ
|
||||
if len(self.record.graduniv_code) > 0:
|
||||
@ -314,15 +314,15 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
set_clauses.append('drday_year = :drday_year')
|
||||
set_clauses.append('drday_y = :drday_y')
|
||||
if self.record.drda_yera == '@':
|
||||
self.query_parameter['drda_yera'] = ''
|
||||
self.query_parameter['drday_year'] = ''
|
||||
self.query_parameter['drday_y'] = ''
|
||||
self.query_parameter['drda_yera'] = None
|
||||
self.query_parameter['drday_year'] = None
|
||||
self.query_parameter['drday_y'] = None
|
||||
|
||||
# 住所不明
|
||||
if len(self.record.dr_addr_lost_code) > 0:
|
||||
set_clauses.append('addr_unknown_reason_cd = :dr_addr_lost_code')
|
||||
if self.record.dr_addr_lost_code == '@':
|
||||
self.query_parameter['dr_addr_lost_code'] = ''
|
||||
self.query_parameter['dr_addr_lost_code'] = None
|
||||
|
||||
# 住所
|
||||
# 集合項目のいずれかに入力がある場合に更新
|
||||
@ -341,31 +341,31 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
if len(self.record.dr_tel) > 0:
|
||||
set_clauses.append('home_phone_number = :dr_tel')
|
||||
if self.record.dr_tel == '@':
|
||||
self.query_parameter['dr_tel'] = ''
|
||||
self.query_parameter['dr_tel'] = None
|
||||
|
||||
# 利用停止区分
|
||||
if len(self.record.use_stop_flag) > 0:
|
||||
set_clauses.append('use_stop_div = :use_stop_flag')
|
||||
if self.record.use_stop_flag == '@':
|
||||
self.query_parameter['use_stop_flag'] = ''
|
||||
self.query_parameter['use_stop_flag'] = None
|
||||
|
||||
# 利用停止理由
|
||||
if len(self.record.use_stopc_ode) > 0:
|
||||
set_clauses.append('use_stop_reason_cd = :use_stopc_ode')
|
||||
if self.record.use_stopc_ode == '@':
|
||||
self.query_parameter['use_stopc_ode'] = ''
|
||||
self.query_parameter['use_stopc_ode'] = None
|
||||
|
||||
# 利用停止登録年月日
|
||||
if len(self.record.cre_stop_date) > 0:
|
||||
set_clauses.append('use_stop_regist_ymd = :cre_stop_date')
|
||||
if self.record.cre_stop_date == '@':
|
||||
self.query_parameter['cre_stop_date'] = ''
|
||||
self.query_parameter['cre_stop_date'] = None
|
||||
|
||||
# 利用停止解除年月日
|
||||
if len(self.record.release_date) > 0:
|
||||
set_clauses.append('use_stop_cancel_ymd = :release_date')
|
||||
if self.record.release_date == '@':
|
||||
self.query_parameter['release_date'] = ''
|
||||
self.query_parameter['release_date'] = None
|
||||
|
||||
# 開勤区分
|
||||
if len(self.record.pract_class_code) > 0:
|
||||
@ -377,9 +377,9 @@ class ComDrMapper(UltmarcTableMapper):
|
||||
set_clauses.append('estab_year = :pract_year')
|
||||
set_clauses.append('estab_y = :estab_y')
|
||||
if self.record.pract_yearera == '@':
|
||||
self.query_parameter['pract_yearera'] = ''
|
||||
self.query_parameter['pract_year'] = ''
|
||||
self.query_parameter['estab_y'] = ''
|
||||
self.query_parameter['pract_yearera'] = None
|
||||
self.query_parameter['pract_year'] = None
|
||||
self.query_parameter['estab_y'] = None
|
||||
|
||||
# 一括登録ﾌﾗｸﾞ
|
||||
if len(self.record.bskregst_flag) > 0:
|
||||
|
||||
@ -345,83 +345,83 @@ class ComInstMapper(UltmarcTableMapper):
|
||||
if len(self.record.uncheck_flag) > 0:
|
||||
set_clauses.append('unconf_flg = :uncheck_flag')
|
||||
if self.record.uncheck_flag == '@':
|
||||
self.query_parameter['uncheck_flag'] = ''
|
||||
self.query_parameter['uncheck_flag'] = None
|
||||
|
||||
# 削除予定理由コード
|
||||
if len(self.record.hpdel_code) > 0:
|
||||
set_clauses.append('delete_sche_reason_cd = :hpdel_code')
|
||||
if self.record.hpdel_code == '@':
|
||||
self.query_parameter['hpdel_code'] = ''
|
||||
self.query_parameter['hpdel_code'] = None
|
||||
|
||||
# 重複時相手先コード
|
||||
if len(self.record.dup_opp_code) > 0:
|
||||
set_clauses.append('dup_opp_cd = :dup_opp_code')
|
||||
if self.record.duphp_id == '@':
|
||||
self.query_parameter['dup_opp_code'] = ''
|
||||
self.query_parameter['dup_opp_code'] = None
|
||||
|
||||
# 住所不明理由コード
|
||||
if len(self.record.hp_addr_lost_code) > 0:
|
||||
set_clauses.append('addr_unknown_reason_cd = :hp_addr_lost_code')
|
||||
if self.record.hp_addr_lost_code == '@':
|
||||
self.query_parameter['hp_addr_lost_code'] = ''
|
||||
self.query_parameter['hp_addr_lost_code'] = None
|
||||
|
||||
# 電話番号なしフラグ
|
||||
if len(self.record.tel_nothing_flag) > 0:
|
||||
set_clauses.append('phone_number_non_flg = :tel_nothing_flag')
|
||||
if self.record.tel_nothing_flag == '@':
|
||||
self.query_parameter['tel_nothing_flag'] = ''
|
||||
self.query_parameter['tel_nothing_flag'] = None
|
||||
|
||||
# 電話番号
|
||||
if len(self.record.hp_tel) > 0:
|
||||
set_clauses.append('inst_phone_number = :hp_tel')
|
||||
if self.record.hp_tel == '@':
|
||||
self.query_parameter['hp_tel'] = ''
|
||||
self.query_parameter['hp_tel'] = None
|
||||
|
||||
# 施設代表者コード
|
||||
if len(self.record.inst_repre_code) > 0:
|
||||
set_clauses.append('inst_repre_cd = :inst_repre_code')
|
||||
if self.record.president_id == '@':
|
||||
self.query_parameter['inst_repre_code'] = ''
|
||||
self.query_parameter['inst_repre_code'] = None
|
||||
|
||||
# 代表者(ｶﾅ)
|
||||
if len(self.record.president_kana) > 0:
|
||||
set_clauses.append('inst_repre_kana = :president_kana')
|
||||
if self.record.president_kana == '@':
|
||||
self.query_parameter['president_kana'] = ''
|
||||
self.query_parameter['president_kana'] = None
|
||||
|
||||
# 代表者(漢字) ※「＠」が大文字
|
||||
if len(self.record.president) > 0:
|
||||
set_clauses.append('inst_repre = :president')
|
||||
if self.record.president == '＠':
|
||||
self.query_parameter['president'] = ''
|
||||
self.query_parameter['president'] = None
|
||||
|
||||
# 開業予定ﾌﾗｸﾞ・開業予定年月
|
||||
if len(self.record.open_flag + self.record.open_year_month) > 0:
|
||||
set_clauses.append('estab_sche_flg = :open_flag')
|
||||
set_clauses.append('estab_sche_ym = :open_year_month')
|
||||
if self.record.open_flag == '@':
|
||||
self.query_parameter['open_flag'] = ''
|
||||
self.query_parameter['open_year_month'] = ''
|
||||
self.query_parameter['open_flag'] = None
|
||||
self.query_parameter['open_year_month'] = None
|
||||
|
||||
# 休院ﾌﾗｸﾞ・休院開始年月
|
||||
if len(self.record.close_flag + self.record.close_year_month) > 0:
|
||||
set_clauses.append('close_flg = :close_flag')
|
||||
set_clauses.append('close_start_ym = :close_year_month')
|
||||
if self.record.close_flag == '@':
|
||||
self.query_parameter['close_flag'] = ''
|
||||
self.query_parameter['close_year_month'] = ''
|
||||
self.query_parameter['close_flag'] = None
|
||||
self.query_parameter['close_year_month'] = None
|
||||
|
||||
# 関連大学親コード
|
||||
if len(self.record.univ_prnt_code) > 0:
|
||||
set_clauses.append('rltd_univ_prnt_cd = :univ_prnt_code')
|
||||
if self.record.assoc_parrent_id == '@':
|
||||
self.query_parameter['univ_prnt_code'] = ''
|
||||
self.query_parameter['univ_prnt_code'] = None
|
||||
|
||||
# 病棟閉鎖フラグ
|
||||
if len(self.record.close_flag2) > 0:
|
||||
set_clauses.append('ward_abolish_flg = :close_flag2')
|
||||
if self.record.close_flag2 == '@':
|
||||
self.query_parameter['close_flag2'] = ''
|
||||
self.query_parameter['close_flag2'] = None
|
||||
|
||||
# 病床数(定員)
|
||||
if self.record.bed_num is not None:
|
||||
@ -433,7 +433,7 @@ class ComInstMapper(UltmarcTableMapper):
|
||||
if len(self.record.bed_class_maint_date) > 0:
|
||||
set_clauses.append('prmit_bed_maint_ymd = :bed_class_maint_date')
|
||||
if self.record.bed_class_maint_date == '@':
|
||||
self.query_parameter['bed_class_maint_date'] = ''
|
||||
self.query_parameter['bed_class_maint_date'] = None
|
||||
|
||||
# 許可ベッド数（合計、精神、結核、感染、その他、一般病床、療養病床）
|
||||
if not self.record.prmit_bed.count(None) == len(self.record.prmit_bed):
|
||||
@ -463,13 +463,13 @@ class ComInstMapper(UltmarcTableMapper):
|
||||
set_clauses.append('insp_item_biochem = :inspect_code6')
|
||||
set_clauses.append('insp_item_ri = :inspect_code7')
|
||||
if self.record.inspect_code1 == '@':
|
||||
self.query_parameter['inspect_code1'] = ''
|
||||
self.query_parameter['inspect_code2'] = ''
|
||||
self.query_parameter['inspect_code3'] = ''
|
||||
self.query_parameter['inspect_code4'] = ''
|
||||
self.query_parameter['inspect_code5'] = ''
|
||||
self.query_parameter['inspect_code6'] = ''
|
||||
self.query_parameter['inspect_code7'] = ''
|
||||
self.query_parameter['inspect_code1'] = None
|
||||
self.query_parameter['inspect_code2'] = None
|
||||
self.query_parameter['inspect_code3'] = None
|
||||
self.query_parameter['inspect_code4'] = None
|
||||
self.query_parameter['inspect_code5'] = None
|
||||
self.query_parameter['inspect_code6'] = None
|
||||
self.query_parameter['inspect_code7'] = None
|
||||
|
||||
update_columns = ','.join(set_clauses)
|
||||
# 何も更新項目が無い場合は更新処理は行わない
|
||||
@ -521,7 +521,7 @@ class ComInstMapper(UltmarcTableMapper):
|
||||
|
||||
# 存在する場合はUpdate
|
||||
if self.record.dcfhp_92id == "@":
|
||||
self.query_parameter['dcf_prnt_inst_code'] = ''
|
||||
self.query_parameter['dcf_prnt_inst_code'] = None
|
||||
self.query_parameter['delete_ymd'] = self.query_parameter['execute_date_str_ymd']
|
||||
else:
|
||||
self.query_parameter['delete_ymd'] = None
|
||||
|
||||
@ -116,22 +116,22 @@ class ComSpFieldMapper(UltmarcTableMapper):
|
||||
set_clauses.append('specialst_flg = :specialst_flg')
|
||||
set_clauses.append('specialst_publsh_ymd = :specialst_publsh_ymd')
|
||||
if self.record.specialst_flg == '@':
|
||||
self.query_parameter['specialst_flg'] = ''
|
||||
self.query_parameter['specialst_publsh_ymd'] = ''
|
||||
self.query_parameter['specialst_flg'] = None
|
||||
self.query_parameter['specialst_publsh_ymd'] = None
|
||||
|
||||
if len(self.record.ackn_med_flg) > 0:
|
||||
set_clauses.append('ackn_med_flg = :ackn_med_flg')
|
||||
set_clauses.append('ackn_med_publsh_ymd = :ackn_med_publsh_ymd')
|
||||
if self.record.ackn_med_flg == '@':
|
||||
self.query_parameter['ackn_med_flg'] = ''
|
||||
self.query_parameter['ackn_med_publsh_ymd'] = ''
|
||||
self.query_parameter['ackn_med_flg'] = None
|
||||
self.query_parameter['ackn_med_publsh_ymd'] = None
|
||||
|
||||
if len(self.record.guide_med_flg) > 0:
|
||||
set_clauses.append('guide_med_flg = :guide_med_flg')
|
||||
set_clauses.append('guide_med_publsh_ymd = :guide_med_publsh_ymd')
|
||||
if self.record.guide_med_flg == '@':
|
||||
self.query_parameter['guide_med_flg'] = ''
|
||||
self.query_parameter['guide_med_publsh_ymd'] = ''
|
||||
self.query_parameter['guide_med_flg'] = None
|
||||
self.query_parameter['guide_med_publsh_ymd'] = None
|
||||
|
||||
update_columns = ','.join(set_clauses)
|
||||
# 何も更新項目が無い場合はNoneとする（更新処理は行わない）
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
"dcf_pcf_dr_cd","dr_name_kana","dr_name","birthday_era","birthday_year","birthday_month","birthday_day","birthday","hometown_cd","estab_era","estab_year","estab_y","home_phone_number","home_addr_kana","home_addr","home_postal_number","addr_village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","dr_circle_cd","estab_div_cd","sex_cd","delete_sche_reason_cd","addr_unknown_reason_cd","alma_cd","depart_disc_cd","grad_era","grad_year","grad_y","lump_regist_flg","opp_dup_cd","dr_ph_div","use_stop_div","use_stop_reason_cd","use_stop_regist_ymd","use_stop_cancel_ymd","drday_era","drday_year","drday_y","cor_dnfdr_cd","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
|
||||
"0122222233","12","11","4","15","06","17","20030617","18","4","55","2043","045-625-2048","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","7","1","022","3","1","21","1888","6","8910","1","49","50","20200501","20200502","4","25","2013","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper"
|
||||
"0199430100","ｶﾝﾏ ｾｲｷ","菅間 正気","3","16","01","14","19410114","37","","","NULL","045-999-9999","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾆﾝｷﾞﾖｳﾁﾖｳ 2-7-10-10","東京都中央区日本橋人形町２－７－１０－１０","103-0013","13102022002","13","102","2-7-10-10","09090909","09090909","37","1","2","","","022","2","3","44","1969","1","0199809900","1","03","B06","20160831","20161125","3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越 正信","3","29","01","06","19540106","53","4","04","1992","","","","","00000000000","00","000","","00000000","00000000","55","2","1","5","7","039","1","3","53","1978","","NULL","1","02","A05","20051003","","3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199768200","ﾖｺﾊﾏ ﾐｷｺ","横浜 三紀子","4","3","11","12","19911112","99","","","NULL","03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2","","","057","1","3","52","1977","1","NULL","1","","","","","3","10","1935","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199790600","ｵｶ ﾓﾘﾏｻ","丘 守正","","","","","","99","","","","","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２−４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1","","5","799","1","","","","","NULL","1","","","","","","","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田 茜","4","2","09","22","19900922","37","","","NULL","","ｶﾅｶﾞﾜｹﾝ ｶﾏｸﾗｼ ﾀﾏﾅﾜ 2-8-30","神奈川県鎌倉市玉縄２－８－３０","555-6666","01002033444","01","002","2-8-30","00000000","00000000","11","9","2","","","799","1","","","NULL","","0148106500","1","","","","","","","","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"9999999990","12","11","","","","","","18","","","","","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","","","022","3","","","","6","","1","","","","","","","","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper"
|
||||
"0199430100","ｶﾝﾏ ｾｲｷ","菅間 正気","3","16","01","14","19410114","37",,,"NULL","045-999-9999","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾆﾝｷﾞﾖｳﾁﾖｳ 2-7-10-10","東京都中央区日本橋人形町２－７－１０－１０","103-0013","13102022002","13","102","2-7-10-10","09090909","09090909","37","1","2",,,"022","2","3","44","1969","1","0199809900","1","03","B06","20160831","20161125","3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越 正信","3","29","01","06","19540106","53","4","04","1992",,,,,"00000000000","00","000",,"00000000","00000000","55","2","1","5","7","039","1","3","53","1978",,"NULL","1","02","A05","20051003",,"3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199768200","ﾖｺﾊﾏ ﾐｷｺ","横浜 三紀子","4","3","11","12","19911112","99",,,"NULL","03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2",,,"057","1","3","52","1977","1","NULL","1",,,,,"3","10","1935","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199790600","ｵｶ ﾓﾘﾏｻ","丘 守正","NULL","NULL","NULL","NULL","NULL","99","NULL","NULL","NULL","NULL","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２−４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1",,"5","799","1","NULL","NULL","NULL",,"NULL","1",,,,,,,"NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田 茜","4","2","09","22","19900922","37",,,"NULL",,"ｶﾅｶﾞﾜｹﾝ ｶﾏｸﾗｼ ﾀﾏﾅﾜ 2-8-30","神奈川県鎌倉市玉縄２－８－３０","555-6666","01002033444","01","002","2-8-30","00000000","00000000","11","9","2","NULL","NULL","799","1",,,"NULL",,"0148106500","1",,,,,"NULL","NULL","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper"
|
||||
"9999999990","12","11","NULL","NULL","NULL","NULL","NULL","18","NULL","NULL","NULL","NULL","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","NULL","NULL","022","3","NULL","NULL","NULL","6","NULL","1","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper"
|
||||
"9999999999","12","11","4","15","06","17","20030617","18","4","55","2043","045-625-2048","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","7","1","022","3","1","21","1888","6","8910","1","49","50","20200501","20200502","4","25","2013","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","aaaa"
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
"dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","rltd_univ_prnt_cd","bed_num","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","ward_abolish_flg","inst_repre_cd","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","hp_assrt_cd","dup_opp_cd","insp_item_micrb","insp_item_serum","insp_item_blood","insp_item_patho","insp_item_paras","insp_item_biochem","insp_item_ri","re_exam_cd","prmit_bed_num_other","prmit_bed_num_mental","prmit_bed_num_tuber","prmit_bed_num_infection","prmit_bed_num_sum","prmit_bed_num_gen","prmit_bed_num_rcup","prmit_bed_maint_ymd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
|
||||
"009900146","10","","ﾃｽﾄｲﾘﾖｳﾎｳｼﾞﾝｹｲﾛｳｶｲﾓﾘｵｶﾅｲｶ","ﾓﾘｵｶﾅｲｶ ｲﾘﾖｳ","医療法人敬老会森岡内科","森岡内科 医療","","NULL","","","","","","01092029","ﾊﾞﾝﾄﾞｳ ｼﾖｳｼﾞ","板東 章二","","","088-623-6161","ﾄｸｼﾏｹﾝ ﾄｸｼﾏｼ ﾄｸｼﾏﾎﾝﾁﾖｳ 2-31","徳島県徳島市徳島本町２－３１","770-0854","36201117002","36","201","2-31","07061002","03030402","221","2","7","003631462","","","","","","","","3","NULL","NULL","NULL","NULL","NULL","NULL","NULL","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:28","com_inst_mapper"
|
||||
"009900194","10","","ｲﾁｺﾞｻﾞｷｲｲﾝ","ｲﾁｺﾞｻﾞｷｲｲﾝ","一期崎医院","一期崎医院","","0","","","","","","","","","1","","","ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 1-5-18 ｶ-ﾄﾌﾞﾗﾝｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 3F","東京都港区麻布十番１－５－１８ カートブラン麻布十番３Ｆ","106-0045","11222333444","11","222","1-5-18-10-3","07051302","03020402","472","","7","","","","","","","","","6","0","0","0","0","0","0","0","20090430","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009901649","60","","ｼﾔﾌｸﾒｲﾜｶｲﾄｸﾍﾞﾂﾖｳｺﾞﾛｳｼﾞﾝﾎ-ﾑｱﾂﾞｷ","ｱﾂﾞｷ ｼﾔﾌｸ","社会福祉法人明和会特別養護老人ホームあづき","あづき（てすと）","","50","","1","","201801","","","","","","","0879-62-7707","ｶｶﾞﾜｹﾝ ｼﾖｳｽﾞｸﾞﾝ ﾄﾉｼﾖｳﾁﾖｳ ｱｻﾞﾊﾝﾉｲｹｺｳ 1360-143","香川県小豆郡土庄町字半ノ池甲１３６０－１４３","761-4100","37322000000","37","322","","07180000","03060000","435","","1","","","","","","","","","9","","","","","","","","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009901679","60","","ｶｺﾞｼﾏｼｲｼｶｲﾘﾝｼﾖｳｹﾝｻｾﾝﾀ-","ｶｺﾞｼﾏﾃｽﾄ","鹿児島市医師会臨床検査センター","鹿児島市医師会臨床検査センター","","0","","","","","1","01148013","ｶｲｴﾀﾞ ﾀｹﾙ","海江田 健","","","","ｶｺﾞｼﾏｹﾝ ｶｺﾞｼﾏｼ ｶｼﾞﾔﾁﾖｳ 3-10","鹿児島県鹿児島市加治屋町３－１０","892-0846","46201017000","46","201","3-10","08070800","04040400","470","","9","","","","","","","","","9","","","","","","","","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009904439","01","","ｶﾜｻｷｼﾘﾂｲﾀﾞﾋﾞﾖｳｲﾝ","ｲﾀﾞﾋﾞﾖｳｲﾝ ｼﾘﾂ","川崎市立テスト病院","井田病院 市立","111234567","370","","","","","","","","","","","044-766-2188","ｶﾅｶﾞﾜｹﾝ ｶﾜｻｷｼ ﾅｶﾊﾗｸ ｲﾀﾞ 2-27-1","神奈川県川崎市中原区井田２－２７－１","211-0035","14133001002","14","133","2-27-1","08120402","04060202","221","","1","","3","","1","","2","","3","3","343","0","27","0","370","343","0","20140811","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009929798","10","6","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","パーソナルヘルス学びのクリニック","パーソナルヘルス学びのＣＬ","","0","","","","","","","","","","","","ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ﾐﾅﾐｱｵﾔﾏ 2-2-1 ｳｲﾝｱｵﾔﾏ 405","東京都港区南青山２－２－１５ ウイン青山４０５","107-0062","13103025002","13","103","2-2-15-405","07050802","03020302","472","","7","","","","","","","","","6","95","92","93","94","91","96","97","20130415","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-02-01 11:08:30","com_inst_mapper"
|
||||
"009900146","10",,"ﾃｽﾄｲﾘﾖｳﾎｳｼﾞﾝｹｲﾛｳｶｲﾓﾘｵｶﾅｲｶ","ﾓﾘｵｶﾅｲｶ ｲﾘﾖｳ","医療法人敬老会森岡内科","森岡内科 医療","NULL","NULL","NULL",,"NULL",,"NULL","01092029","ﾊﾞﾝﾄﾞｳ ｼﾖｳｼﾞ","板東 章二",,,"088-623-6161","ﾄｸｼﾏｹﾝ ﾄｸｼﾏｼ ﾄｸｼﾏﾎﾝﾁﾖｳ 2-31","徳島県徳島市徳島本町２－３１","770-0854","36201117002","36","201","2-31","07061002","03030402","221","2","7","003631462",,,,,,,,"3","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:28","com_inst_mapper"
|
||||
"009900194","10","NULL","ｲﾁｺﾞｻﾞｷｲｲﾝ","ｲﾁｺﾞｻﾞｷｲｲﾝ","一期崎医院","一期崎医院",,"0",,,,,,,,,"1","NULL",,"ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 1-5-18 ｶ-ﾄﾌﾞﾗﾝｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 3F","東京都港区麻布十番１－５－１８ カートブラン麻布十番３Ｆ","106-0045","11222333444","11","222","1-5-18-10-3","07051302","03020402","472","NULL","7","NULL",,,,,,,,"6","0","0","0","0","0","0","0","20090430","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009901649","60",,"ｼﾔﾌｸﾒｲﾜｶｲﾄｸﾍﾞﾂﾖｳｺﾞﾛｳｼﾞﾝﾎ-ﾑｱﾂﾞｷ","ｱﾂﾞｷ ｼﾔﾌｸ","社会福祉法人明和会特別養護老人ホームあづき","あづき（てすと）",,"50",,"1",,"201801",,,,,,,"0879-62-7707","ｶｶﾞﾜｹﾝ ｼﾖｳｽﾞｸﾞﾝ ﾄﾉｼﾖｳﾁﾖｳ ｱｻﾞﾊﾝﾉｲｹｺｳ 1360-143","香川県小豆郡土庄町字半ノ池甲１３６０－１４３","761-4100","37322000000","37","322",,"07180000","03060000","435",,"1",,,,,,,,,"9",,,,,,,,,"1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009901679","60",,"ｶｺﾞｼﾏｼｲｼｶｲﾘﾝｼﾖｳｹﾝｻｾﾝﾀ-","ｶｺﾞｼﾏﾃｽﾄ","鹿児島市医師会臨床検査センター","鹿児島市医師会臨床検査センター",,"0",,"NULL",,"NULL","1","01148013","ｶｲｴﾀﾞ ﾀｹﾙ","海江田 健",,,"NULL","ｶｺﾞｼﾏｹﾝ ｶｺﾞｼﾏｼ ｶｼﾞﾔﾁﾖｳ 3-10","鹿児島県鹿児島市加治屋町３－１０","892-0846","46201017000","46","201","3-10","08070800","04040400","470",,"9",,"NULL","NULL","NULL","NULL","NULL","NULL","NULL","9",,,,,,,,,"1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009904439","01",,"ｶﾜｻｷｼﾘﾂｲﾀﾞﾋﾞﾖｳｲﾝ","ｲﾀﾞﾋﾞﾖｳｲﾝ ｼﾘﾂ","川崎市立テスト病院","井田病院 市立","111234567","370",,,,,,,,,,,"044-766-2188","ｶﾅｶﾞﾜｹﾝ ｶﾜｻｷｼ ﾅｶﾊﾗｸ ｲﾀﾞ 2-27-1","神奈川県川崎市中原区井田２－２７－１","211-0035","14133001002","14","133","2-27-1","08120402","04060202","221",,"1",,"3",,"1",,"2",,"3","3","343","0","27","0","370","343","0","20140811","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper"
|
||||
"009929798","10","6","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","パーソナルヘルス学びのクリニック","パーソナルヘルス学びのＣＬ",,"0",,,,,,"NULL","NULL","NULL","NULL",,,"ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ﾐﾅﾐｱｵﾔﾏ 2-2-1 ｳｲﾝｱｵﾔﾏ 405","東京都港区南青山２－２－１５ ウイン青山４０５","107-0062","13103025002","13","103","2-2-15-405","07050802","03020302","472",,"7",,,,,,,,,"6","95","92","93","94","91","96","97","20130415","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-02-01 11:08:30","com_inst_mapper"
|
||||
"223333344","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_inst_mapper","2023/04/12 00:00:00","com_inst_mapper"
|
||||
"223333399","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_inst_mapper","2023/04/12 00:00:00","com_inst_mapper"
|
||||
"993333344","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","aaaa"
|
||||
"999999999","37","","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","","NULL","","","","","","","","","","","","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","","7","","","","","","","","","8","NULL","NULL","NULL","NULL","NULL","NULL","NULL","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_inst_mapper"
|
||||
"999999999","37","NULL","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","NULL","7","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","8","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_inst_mapper"
|
||||
|
||||
|
@ -21,6 +21,17 @@ class TestComInstMapper:
|
||||
batch_context: BatchContext
|
||||
test_file_path: str = path.dirname(__file__)
|
||||
|
||||
smallint_columns = [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup'
|
||||
]
|
||||
|
||||
@pytest.fixture(autouse=True, scope='function')
|
||||
def pre_test(self, database: Database):
|
||||
"""テスト実行前後処理"""
|
||||
@ -76,19 +87,7 @@ class TestComInstMapper:
|
||||
actual_select_sql = f"SELECT * FROM src05.com_inst WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})"
|
||||
actual_data_list = self.db.execute_select(actual_select_sql)
|
||||
# 期待値検査
|
||||
ignore_columns = [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup',
|
||||
'regist_ymd',
|
||||
'regist_ymd',
|
||||
'sys_update_date',
|
||||
'sys_regist_date']
|
||||
ignore_columns = ['regist_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
|
||||
@ -96,15 +95,7 @@ class TestComInstMapper:
|
||||
line_number += 1
|
||||
for actual_col_name, expect_col_name in zip(actual_row, expect_row):
|
||||
if actual_col_name in ignore_columns:
|
||||
if actual_col_name in [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup']:
|
||||
if actual_col_name in self.smallint_columns:
|
||||
if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0:
|
||||
assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること'
|
||||
else:
|
||||
@ -224,19 +215,7 @@ class TestComInstMapper:
|
||||
actual_data_list = self.db.execute_select(actual_select_sql)
|
||||
# 期待値検査
|
||||
# 期待値検査
|
||||
ignore_columns = [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup',
|
||||
'regist_ymd',
|
||||
'regist_ymd',
|
||||
'sys_update_date',
|
||||
'sys_regist_date']
|
||||
ignore_columns = ['regist_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
|
||||
@ -247,15 +226,7 @@ class TestComInstMapper:
|
||||
if expect_row[expect_col_name] is None:
|
||||
assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
|
||||
else:
|
||||
if actual_col_name in [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup']:
|
||||
if actual_col_name in self.smallint_columns:
|
||||
if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0:
|
||||
assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること'
|
||||
else:
|
||||
@ -379,19 +350,7 @@ class TestComInstMapper:
|
||||
actual_select_sql = f"SELECT * FROM src05.com_inst WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})"
|
||||
actual_data_list = self.db.execute_select(actual_select_sql)
|
||||
# 期待値検査
|
||||
ignore_columns = [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup',
|
||||
'regist_ymd',
|
||||
'regist_ymd',
|
||||
'sys_update_date',
|
||||
'sys_regist_date']
|
||||
ignore_columns = ['regist_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
|
||||
@ -402,15 +361,7 @@ class TestComInstMapper:
|
||||
if expect_row[expect_col_name] is None:
|
||||
assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと'
|
||||
else:
|
||||
if actual_col_name in [
|
||||
'bed_num',
|
||||
'prmit_bed_num_other',
|
||||
'prmit_bed_num_mental',
|
||||
'prmit_bed_num_tuber',
|
||||
'prmit_bed_num_infection',
|
||||
'prmit_bed_num_sum',
|
||||
'prmit_bed_num_gen',
|
||||
'prmit_bed_num_rcup']:
|
||||
if actual_col_name in self.smallint_columns:
|
||||
if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0:
|
||||
assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること'
|
||||
else:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
|
||||
"0199430100","0003","2","1","20170401","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
"0199430100","0003","2","1","20170401","NULL","NULL","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
"0199578300","0003","2","1","20170221","1","20140810","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
"0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField"
|
||||
"0199790600","0032","2","","","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
"0199790600","0032","2","NULL","NULL","","","NULL","NULL","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
"0199961300","0056","2","1","20180706","1","20170101","1","20180706","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user