nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新処理の仕様変更中（エラーこみ）

Browse Source
This commit is contained in:
野間 2023-04-21 14:16:38 +09:00
parent ab6920e16a
commit b28f7f1612
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py
View File

@ -4,7 +4,7 @@ from src.batch.ultmarc.utmp_tables.tables.com_dr_wrkplace import ComDrWrkplace
class ComDrWrkplaceMapper(UltmarcTableMapper):
"""レイアウト区分501-01:COM_医師勤務先 登録処理"""
"""レイアウト区分502:COM_医師勤務先 登録処理"""
# レコード存在確認SQL
RECORD_EXISTS_QUERY = """\
@ -212,13 +212,14 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
make_history_query = self.TO_HISTORY_QUERY
update_columns = ','.join(set_clauses_with_historical + set_clause_without_historical)
if len(update_columns) > 0:
if len(update_columns) == 0:
update_query = None
else:
# 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる
update_columns += ','
update_query = self.UPDATE_QUERY.format(
update_columns=update_columns
)
update_query = self.UPDATE_QUERY.format(
update_columns=update_columns
)
return [make_history_query, update_query]

3
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv
View File

@ -2,4 +2,5 @@
"502","01","995783","","B","00","5507600","","","20170907","20170910","@","802","@","＠","@",""
"502","01","997682","","A","00","5408060","","","20141113","20141114","","","","","",""
"502","01","997682","","B","00","5402984","","","20141113","20141114","165","@","","","",""
"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ",""
"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ",""
"502","01","999999","","B","00","5409446","","","20170906","20170910","","","","","",""
1 502 01 997906 B 00 5409446 20170906 20170910 @
2 502 01 995783 B 00 5507600 20170907 20170910 @ 802 @ ＠ @
3 502 01 997682 A 00 5408060 20141113 20141114
4 502 01 997682 B 00 5402984 20141113 20141114 165 @
5 502 01 999613 B 00 5504428 2 20170328 20170401 501 9999 内分泌・骨代謝外来 ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ
6 502 01 999999 B 00 5409446 20170906 20170910

1
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv
View File

@ -9,3 +9,4 @@
"005504428","01997906","7212",,"144","2020-02-22","ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005507600","01997906","9114",,"144","2020-02-22","ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005504428","01999613","5140",,"144","2020-02-22","ﾔｸﾘｶﾞｸ","薬理学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005409446","01999999","1118",,,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:54:00","com_dr_wrkplace_mapper"

1 dcf_dsf_inst_cd dcf_pcf_dr_cd blng_sec_cd post_cd identity_cd aply_start_ymd blng_sec_name_kana blng_sec_name notdm_flg regist_ymd update_ymd regist_date create_user update_date update_user sys_regist_date regist_prgm_id sys_update_date update_prgm_id
9 005504428 01997906 7212 144 2020-02-22 ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ 輸血・細胞治療学 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
10 005507600 01997906 9114 144 2020-02-22 ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ 細胞移植部門 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
11 005504428 01999613 5140 144 2020-02-22 ﾔｸﾘｶﾞｸ 薬理学 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
12 005409446 01999999 1118 2020-02-22 ｹﾂｴｷﾅｲｶ 血液内科 2022-02-02 NULL NULL NULL NULL NULL 2022-02-02 10:45:16 com_dr_wrkplace_mapper 2022-02-02 14:54:00 com_dr_wrkplace_mapper

17
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv
View File

@ -1,11 +1,12 @@
"dcf_dsf_inst_cd","dcf_pcf_dr_cd","blng_sec_cd","post_cd","identity_cd","aply_start_ymd","blng_sec_name_kana","blng_sec_name","notdm_flg","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
"005414992","01995783",,"501",,"2020-02-22",,,,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005507600","01995783","9999",,"802","2020-02-23","NULL","NULL","1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005402984","01997682","1512","165",,"2020-02-23","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005408060","01997682","6802",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005412977","01997682","6720",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005409446","01997906","1118","501",,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005503358","01997906","1118","172","144","2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005504428","01997906","7212",,"144","2020-02-22","ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005507600","01997906","9114",,"144","2020-02-22","ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005504428","01999613","9999","501","144","2020-02-23","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005402984","01997682","1512","165",,"2020-02-23","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper"
"005408060","01997682","6802",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","clsComDrWrk"
"005412977","01997682","6720",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk"
"005409446","01997906","1118","501",,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper"
"005409446","01999999","1118",,,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:00:00","com_dr_wrkplace_mapper"
"005503358","01997906","1118","172","144","2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk"
"005504428","01997906","7212",,"144","2020-02-22","ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk"
"005507600","01997906","9114",,"144","2020-02-22","ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk"
"005504428","01999613","9999","501","144","2020-02-23","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper"

1 dcf_dsf_inst_cd dcf_pcf_dr_cd blng_sec_cd post_cd identity_cd aply_start_ymd blng_sec_name_kana blng_sec_name notdm_flg regist_ymd update_ymd regist_date create_user update_date update_user sys_regist_date regist_prgm_id sys_update_date update_prgm_id
2 005414992 01995783 501 2020-02-22 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
3 005507600 01995783 9999 802 2020-02-23 NULL NULL 1 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 com_dr_wrkplace_mapper
4 005402984 01997682 1512 165 2020-02-23 ｼﾖｳｶｷｹﾞｶ 消化器外科 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 2022-02-03 14:00:43 com_dr_wrkplace_mapper
5 005408060 01997682 6802 144 2020-02-22 ｼﾖｳｶｷｹﾞｶｶﾞｸ1 消化器外科学Ⅰ 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 com_dr_wrkplace_mapper clsComDrWrk
6 005412977 01997682 6720 144 2020-02-22 ｼﾖｳｶｷｹﾞｶｶﾞｸ 消化器外科学 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 2022-02-03 14:00:39 clsComDrWrk
7 005409446 01997906 1118 501 2020-02-22 ｹﾂｴｷﾅｲｶ 血液内科 NULL 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 2022-02-03 14:00:43 com_dr_wrkplace_mapper
8 005503358 005409446 01997906 01999999 1118 172 144 2020-02-22 ｹﾂｴｷﾅｲｶ 血液内科 2022-02-03 2022-02-02 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 2022-02-02 10:45:16 clsComDrWrk com_dr_wrkplace_mapper 2022-02-03 14:23:39 2022-02-02 14:00:00 clsComDrWrk com_dr_wrkplace_mapper
9 005504428 005503358 01997906 7212 1118 172 144 2020-02-22 ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ ｹﾂｴｷﾅｲｶ 輸血・細胞治療学 血液内科 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 2022-02-03 14:00:39 clsComDrWrk
10 005507600 005504428 01997906 9114 7212 144 2020-02-22 ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ 細胞移植部門 輸血・細胞治療学 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 2022-02-03 14:00:39 clsComDrWrk
11 005504428 005507600 01999613 01997906 9999 9114 501 144 2020-02-23 2020-02-22 ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ 内分泌・骨代謝外来 細胞移植部門 2022-02-03 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 2022-02-03 14:00:39 com_dr_wrkplace_mapper clsComDrWrk
12 005504428 01999613 9999 501 144 2020-02-23 ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ 内分泌・骨代謝外来 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:00:43 com_dr_wrkplace_mapper

4
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py
View File

@ -29,13 +29,13 @@ class TestComDrWrkplaceMapper:
# setup
self.db = database
self.db.connect()
self.db.begin()
# self.db.begin()
# testing
yield
# teardown
self.db.rollback()
# self.db.rollback()
self.db.disconnect()
def test_insert_record(self):