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

Merge pull request #251 feature-NEWDWH2021-1181 into develop

Browse Source
This commit is contained in:
朝倉 明日香 2023-08-18 12:01:09 +09:00
commit c7bd53897a
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,8 +121,8 @@ class ComDrWrkplaceMapper(UltmarcTableMapper):
notdm_flg,
(
CASE
WHEN DATE_FORMAT(aply_start_ymd, '%Y%m%d') > DATE_FORMAT(:syor_date, '%Y%m%d') -1 THEN DATE_FORMAT(aply_start_ymd, '%Y%m%d')
ELSE DATE_FORMAT(:syor_date, '%Y%m%d') -1
WHEN DATE_FORMAT(aply_start_ymd, '%Y%m%d') > DATE_FORMAT(DATE_SUB(:syor_date, INTERVAL 1 DAY), '%Y%m%d') THEN DATE_FORMAT(aply_start_ymd, '%Y%m%d')
ELSE DATE_FORMAT(DATE_SUB(:syor_date, INTERVAL 1 DAY), '%Y%m%d')
END
) AS aply_end_ymd,
:execute_date_str_ymd,

10
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_his_delete.csv
View File

@ -2,8 +2,8 @@
"1482020","005507600","01995783","9112","133","144","20200222","ﾊﾂｾｲ.ｾｲｼﾖｸﾌﾞﾓﾝ","発生・生殖部門",,"20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"1482021","005402984","01997682","1512","165","144","20200222","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"1482022","005504428","01999613","5140","999","144","20200222","ﾔｸﾘｶﾞｸ","薬理学",,"20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"1482023","005408060","01997682","6802","999","144","20200222","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"20200223","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482024","005409446","01997906","1118","501","999","20200222","ｹﾂｴｷﾅｲｶ","血液内科",,"20200223","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482025","005412977","01997682","6720","999","144","20200222","ｼﾖｳｶｷｹﾞｶｶﾞｸ","消化器外科学",,"20200223","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482026","005414992","01995783","9999","501","999","20200222",,,,"20200223","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482027","005503358","01997906","1118","172","144","20200222","ｹﾂｴｷﾅｲｶ","血液内科",,"20200223","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482023","005408060","01997682","6802","999","144","20200222","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482024","005409446","01997906","1118","501","999","20200222","ｹﾂｴｷﾅｲｶ","血液内科",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482025","005412977","01997682","6720","999","144","20200222","ｼﾖｳｶｷｹﾞｶｶﾞｸ","消化器外科学",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482026","005414992","01995783","9999","501","999","20200222",,,,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
"1482027","005503358","01997906","1118","172","144","20200222","ｹﾂｴｷﾅｲｶ","血液内科",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 16:18:08","com_dr_wrkplace_mapper","2022-02-03 16:18:08","com_dr_wrkplace_mapper"
1 dr_wrkplace_his_key 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 aply_end_ymd 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 1482020 005507600 01995783 9112 133 144 20200222 ﾊﾂｾｲ.ｾｲｼﾖｸﾌﾞﾓﾝ 発生・生殖部門 20200222 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper
3 1482021 005402984 01997682 1512 165 144 20200222 ｼﾖｳｶｷｹﾞｶ 消化器外科 20200222 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper
4 1482022 005504428 01999613 5140 999 144 20200222 ﾔｸﾘｶﾞｸ 薬理学 20200222 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper
5 1482023 005408060 01997682 6802 999 144 20200222 ｼﾖｳｶｷｹﾞｶｶﾞｸ1 消化器外科学Ⅰ 20200223 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 16:18:08 com_dr_wrkplace_mapper 2022-02-03 16:18:08 com_dr_wrkplace_mapper
6 1482024 005409446 01997906 1118 501 999 20200222 ｹﾂｴｷﾅｲｶ 血液内科 20200223 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 16:18:08 com_dr_wrkplace_mapper 2022-02-03 16:18:08 com_dr_wrkplace_mapper
7 1482025 005412977 01997682 6720 999 144 20200222 ｼﾖｳｶｷｹﾞｶｶﾞｸ 消化器外科学 20200223 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 16:18:08 com_dr_wrkplace_mapper 2022-02-03 16:18:08 com_dr_wrkplace_mapper
8 1482026 005414992 01995783 9999 501 999 20200222 20200223 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 16:18:08 com_dr_wrkplace_mapper 2022-02-03 16:18:08 com_dr_wrkplace_mapper
9 1482027 005503358 01997906 1118 172 144 20200222 ｹﾂｴｷﾅｲｶ 血液内科 20200223 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 16:18:08 com_dr_wrkplace_mapper 2022-02-03 16:18:08 com_dr_wrkplace_mapper

6
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_his_update.csv
View File

@ -1,4 +1,4 @@
"dr_wrkplace_his_key","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","aply_end_ymd","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
"1","005507600","01995783","9112","133","144","20200222","ﾊﾂｾｲ.ｾｲｼﾖｸﾌﾞﾓﾝ","発生・生殖部門","1","20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"2","005402984","01997682","1512","165","144","20200222","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"3","005504428","01999613","5140","999","144","20200222","ﾔｸﾘｶﾞｸ","薬理学",,"20200222","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"1","005507600","01995783","9112","133","144","20200222","ﾊﾂｾｲ.ｾｲｼﾖｸﾌﾞﾓﾝ","発生・生殖部門","1","20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"2","005402984","01997682","1512","165","144","20200222","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"3","005504428","01999613","5140","999","144","20200222","ﾔｸﾘｶﾞｸ","薬理学",,"20200229","20220203","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:43:43","com_dr_wrkplace_mapper","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
1 dr_wrkplace_his_key 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 aply_end_ymd 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 1 005507600 01995783 9112 133 144 20200222 ﾊﾂｾｲ.ｾｲｼﾖｸﾌﾞﾓﾝ 発生・生殖部門 1 20200222 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper
3 2 005402984 01997682 1512 165 144 20200222 ｼﾖｳｶｷｹﾞｶ 消化器外科 20200222 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper
4 3 005504428 01999613 5140 999 144 20200222 ﾔｸﾘｶﾞｸ 薬理学 20200222 20200229 20220203 NULL NULL NULL NULL NULL 2022-02-03 14:43:43 com_dr_wrkplace_mapper 2022-02-03 14:43:43 com_dr_wrkplace_mapper

6
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,11 @@
"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"
"005507600","01995783","9999",,"802","2020-03-01","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-03-01","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"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","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","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: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"
"005504428","01999613","9999","501","144","2020-03-01","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","内分泌・骨代謝外来",,"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"

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 2020-03-01 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 2020-03-01 ｼﾖｳｶｷｹﾞｶ 消化器外科 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
5 005408060 01997682 6802 144 2020-02-22 ｼﾖｳｶｷｹﾞｶｶﾞｸ1 消化器外科学Ⅰ 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 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 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 com_dr_wrkplace_mapper
8 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
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 9999 501 144 2020-02-23 2020-03-01 ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ 内分泌・骨代謝外来 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
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py
View File

@ -147,7 +147,7 @@ class TestComDrWrkplaceMapper:
# Arrange
# 処理日設定
# 適用開始日と同値、適用終了日の+1日になる
self.batch_context.syor_date = '2020/02/23'
self.batch_context.syor_date = '2020/03/01'
# テスト用のCSVを読み込む
test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_dr_wrkplace_update.csv'))
# 一旦全データをDBから削除
@ -264,7 +264,7 @@ class TestComDrWrkplaceMapper:
# Arrange
# 処理日設定
self.batch_context.syor_date = '2020/02/24'
self.batch_context.syor_date = '2020/03/01'
# テスト用のCSVを読み込む
test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_dr_wrkplace_delete.csv'))
# 一旦全データをDBから削除

14
ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
View File

@ -55,8 +55,11 @@ class UltmarcDoctorInfoViewModel(BaseModel):
# 医師勤務先履歴_開始年月日
def is_input_his_aply_start_ymd_format(self, aply_start_date_string: str):
if aply_start_date_string:
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d')
try:
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d')
except Exception:
return aply_start_date_string
return self._format_date(aply_start_date)
else:
return ''
@ -64,8 +67,11 @@ class UltmarcDoctorInfoViewModel(BaseModel):
# 医師勤務先履歴_終了年月日
def is_input_his_aply_end_ymd_format(self, aply_end_date_string: str):
if aply_end_date_string:
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d')
try:
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d')
except Exception:
return aply_end_date_string
return self._format_date(aply_end_date)
else:
return ''