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

Merge pull request #262 feature-NEWDWH2021-1197 into develop

Browse Source
This commit is contained in:
朝倉 明日香 2023-08-28 11:29:11 +09:00
commit 1185b6d9ff
4 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py
View File

@ -414,11 +414,14 @@ class ComDrMapper(UltmarcTableMapper):
# 西暦の取得
# 生年月日（西暦）
western_year: str = ""
if self.record.birthday_era != "@" and len(self.record.birthday_era) > 0 and len(self.record.birthday_year) > 0:
self.query_parameter['era_cd'] = self.record.birthday_era
record_year = self.db.execute_select(self.YEAR_GET_QUERY, self.query_parameter)
ans_year = int(record_year[0]['year']) + int(self.record.birthday_year)
self.query_parameter['birth_day'] = ''.join([str(ans_year), self.record.birthday_month, self.record.birthday_day])
western_year = str(int(record_year[0]['year']) + int(self.record.birthday_year))
# 生年月日の設定
self.query_parameter['birth_day'] = self.__set_birthday(western_year)
# 開業年（西暦）
if self.record.pract_yearera != "@" and len(self.record.pract_yearera) > 0 and len(self.record.pract_year) > 0:
@ -439,3 +442,20 @@ class ComDrMapper(UltmarcTableMapper):
self.query_parameter['drday_y'] = str(int(record_year[0]['year']) + int(self.record.drday_year))
return
def __set_birthday(self, western_year: str = ""):
# 生年月日を設定
# 年(西暦)、月、日を連結
birth_day = ''.join([western_year, self.record.birthday_month, self.record.birthday_day])
# 年(西暦)、月、日が全て揃っている場合
if len(birth_day) == 8:
return birth_day
# 西暦が空の場合、先頭に半角スペース4つで連結
if len(western_year) == 0 and len(self.record.birthday_month) > 0 and len(self.record.birthday_day) > 0:
return f' {self.record.birthday_month}{self.record.birthday_day}'
# 月日も空の場合、生年月日は空
return ''

12
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/com_dr_insert.csv
View File

@ -1,6 +1,8 @@
"501","01","222222","33","A","20230425","20230426","7","8","9","10","11","12","1","4","15","06","17","18","19","1","21","022","3","4","25","A26","C27","I28","K29","L30","1","32","033","034","035","231-0036","３７","38","126-1-39","40","41","42","43","44","45","46","47","045-625-2048","49","50","20200501","20200502","3","4","55","6"
"501","01","994301","00","A","20141113","20141114","","","","","菅間　正気","ｶﾝﾏ ｾｲｷ","1","3","16","01","14","37","37","3","44","011","1","3","44","A01","C01","I01","K01","C04","","14","104","094","000","231-0862","神奈川県横浜市中区山手町１２６－１　クレスト山手３０６","ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306","126-1-306","04","05","03","00","08","10","07","00","045-625-2067","","","","","1","","",""
"501","01","995783","00","A","20141113","20141114","","","","","船越　正信","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","1","3","29","01","06","53","55","3","53","039","1","3","53","A01","L01","E02","C04","L03","7","00","000","000","000","","","","","00","00","00","00","00","00","00","00","","02","A05","20051003","","2","","",""
"501","01","997682","00","A","20141113","20141114","","","","","川崎　三紀子","ｶﾜｻｷ ﾐｷｺ","2","3","46","10","03","99","99","4","11","057","1","4","11","A01","A58","","","","","13","119","047","000","173-0001","東京都板橋区本町６－３－３０１","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","6-3-301","03","03","02","00","07","07","06","00","03-3579-1698","","","","","2","","","1"
"501","01","997906","00","A","20141113","20141114","","","","","丘　守正","ｵｶ ﾓﾘﾏｻ","1","3","20","03","11","99","31","3","45","799","1","","","A01","L01","A31","A21","A11","","08","221","095","000","312-0021","茨城県ひたちなか市大字三反田３８９２－４","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","3892-4","03","06","05","00","08","07","11","00","029-274-7110","","","","","1","4","03",""
"501","01","999613","00","A","20141113","20141114","5","01","481065","00","藤田　茜","ﾌｼﾞﾀ ｱｶﾈ","2","","","","","99","99","","","799","1","4","23","","","","","","6","00","000","000","000","","","","","00","00","00","00","00","00","00","00","","","","","","9","","",""
"501","01","994301","00","A","20141113","20141114",,,,,"菅間　正気","ｶﾝﾏ ｾｲｷ","1","3","16","01","14","37","37","3","44","011","1","3","44","A01","C01","I01","K01","C04",,"14","104","094","000","231-0862","神奈川県横浜市中区山手町１２６－１　クレスト山手３０６","ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306","126-1-306","04","05","03","00","08","10","07","00","045-625-2067",,,,,"1",,,
"501","01","995783","00","A","20141113","20141114",,,,,"船越　正信","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","1","3","29","01","06","53","55","3","53","039","1","3","53","A01","L01","E02","C04","L03","7","00","000","000","000",,,,,"00","00","00","00","00","00","00","00",,"02","A05","20051003",,"2",,,
"501","01","997682","00","A","20141113","20141114",,,,,"川崎　三紀子","ｶﾜｻｷ ﾐｷｺ","2","3","46","10","03","99","99","4","11","057","1","4","11","A01","A58",,,,,"13","119","047","000","173-0001","東京都板橋区本町６－３－３０１","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","6-3-301","03","03","02","00","07","07","06","00","03-3579-1698",,,,,"2",,,"1"
"501","01","997906","00","A","20141113","20141114",,,,,"丘　守正","ｵｶ ﾓﾘﾏｻ","1","3","20","03","11","99","31","3","45","799","1",,,"A01","L01","A31","A21","A11",,"08","221","095","000","312-0021","茨城県ひたちなか市大字三反田３８９２－４","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","3892-4","03","06","05","00","08","07","11","00","029-274-7110",,,,,"1","4","03",
"501","01","999613","00","A","20141113","20141114","5","01","481065","00","藤田　茜","ﾌｼﾞﾀ ｱｶﾈ","2",,,,,"99","99",,,"799","1","4","23",,,,,,"6","00","000","000","000",,,,,"00","00","00","00","00","00","00","00",,,,,,"9",,,
"501","01","997907","00","A","20141113","20141114",,,,,"丘　守正","ｵｶ ﾓﾘﾏｻ","1",,,"03","11","99","31","3","45","799","1",,,"","","","","",,"08","221","095","000","312-0021","茨城県ひたちなか市大字三反田３８９２－４","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","3892-4","03","06","05","00","08","07","11","00","029-274-7110",,,,,"1","4","03",
"501","01","997908","00","A","20141113","20141114",,,,,"丘　守正","ｵｶ ﾓﾘﾏｻ","1","3","20",,,"99","31","3","45","799","1",,,"","","","","",,"08","221","095","000","312-0021","茨城県ひたちなか市大字三反田３８９２－４","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","3892-4","03","06","05","00","08","07","11","00","029-274-7110",,,,,"1","4","03",

1 501 01 222222 33 A 20230425 20230426 7 8 9 10 11 12 1 4 15 06 17 18 19 1 21 022 3 4 25 A26 C27 I28 K29 L30 1 32 033 034 035 231-0036 ３７ 38 126-1-39 40 41 42 43 44 45 46 47 045-625-2048 49 50 20200501 20200502 3 4 55 6
2 501 01 994301 00 A 20141113 20141114 菅間　正気 ｶﾝﾏ ｾｲｷ 1 3 16 01 14 37 37 3 44 011 1 3 44 A01 C01 I01 K01 C04 14 104 094 000 231-0862 神奈川県横浜市中区山手町１２６－１　クレスト山手３０６ ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306 126-1-306 04 05 03 00 08 10 07 00 045-625-2067 1
3 501 01 995783 00 A 20141113 20141114 船越　正信 ﾌﾅｺｼ ﾏｻﾉﾌﾞ 1 3 29 01 06 53 55 3 53 039 1 3 53 A01 L01 E02 C04 L03 7 00 000 000 000 00 00 00 00 00 00 00 00 02 A05 20051003 2
4 501 01 997682 00 A 20141113 20141114 川崎　三紀子 ｶﾜｻｷ ﾐｷｺ 2 3 46 10 03 99 99 4 11 057 1 4 11 A01 A58 13 119 047 000 173-0001 東京都板橋区本町６－３－３０１ ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301 6-3-301 03 03 02 00 07 07 06 00 03-3579-1698 2 1
5 501 01 997906 00 A 20141113 20141114 丘　守正 ｵｶ ﾓﾘﾏｻ 1 3 20 03 11 99 31 3 45 799 1 A01 L01 A31 A21 A11 08 221 095 000 312-0021 茨城県ひたちなか市大字三反田３８９２－４ ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 3892-4 03 06 05 00 08 07 11 00 029-274-7110 1 4 03
6 501 01 999613 00 A 20141113 20141114 5 01 481065 00 藤田　茜 ﾌｼﾞﾀ ｱｶﾈ 2 99 99 799 1 4 23 6 00 000 000 000 00 00 00 00 00 00 00 00 9
7 501 01 997907 00 A 20141113 20141114 丘　守正 ｵｶ ﾓﾘﾏｻ 1 03 11 99 31 3 45 799 1 08 221 095 000 312-0021 茨城県ひたちなか市大字三反田３８９２－４ ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 3892-4 03 06 05 00 08 07 11 00 029-274-7110 1 4 03
8 501 01 997908 00 A 20141113 20141114 丘　守正 ｵｶ ﾓﾘﾏｻ 1 3 20 99 31 3 45 799 1 08 221 095 000 312-0021 茨城県ひたちなか市大字三反田３８９２－４ ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 3892-4 03 06 05 00 08 07 11 00 029-274-7110 1 4 03

12
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_insert.csv
View File

@ -1,7 +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","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper"
"0199430100","ｶﾝﾏ ｾｲｷ","菅間　正気","3","16","01","14","19410114","37","","","","045-625-2067","ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306","神奈川県横浜市中区山手町１２６－１　クレスト山手３０６","231-0862","14104094000","14","104","126-1-306","08100700","04050300","37","1","1","","","011","1","3","44","1969","","","1","","","","","3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越　正信","3","29","01","06","19540106","53","","","","","","","","00000000000","00","000","","00000000","00000000","55","2","1","","7","039","1","3","53","1978","","","1","02","A05","20051003","","3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199768200","ｶﾜｻｷ ﾐｷｺ","川崎　三紀子","3","46","10","03","19711003","99","","","","03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2","","","057","1","4","11","1999","1","","1","","","","","4","11","1999","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199790600","ｵｶ ﾓﾘﾏｻ","丘　守正","3","20","03","11","19450311","99","4","03","1991","029-274-7110","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２－４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1","","","799","1","3","45","1970","","","1","","","","","","","","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田　茜","","","","","","99","","","","","","","","00000000000","00","000","","00000000","00000000","99","9","2","5","6","799","1","","","","","0148106500","1","","","","","4","23","2011","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199430100","ｶﾝﾏ ｾｲｷ","菅間　正気","3","16","01","14","19410114","37",,,,"045-625-2067","ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306","神奈川県横浜市中区山手町１２６－１　クレスト山手３０６","231-0862","14104094000","14","104","126-1-306","08100700","04050300","37","1","1",,,"011","1","3","44","1969",,,"1",,,,,"3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越　正信","3","29","01","06","19540106","53",,,,,,,,"00000000000","00","000",,"00000000","00000000","55","2","1",,"7","039","1","3","53","1978",,,"1","02","A05","20051003",,"3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199768200","ｶﾜｻｷ ﾐｷｺ","川崎　三紀子","3","46","10","03","19711003","99",,,,"03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2",,,"057","1","4","11","1999","1",,"1",,,,,"4","11","1999","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199790600","ｵｶ ﾓﾘﾏｻ","丘　守正","3","20","03","11","19450311","99","4","03","1991","029-274-7110","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２－４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1",,,"799","1","3","45","1970",,,"1",,,,,,,,"NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199790700","ｵｶ ﾓﾘﾏｻ","丘　守正",,,"03","11"," 0311","99","4","03","1991","029-274-7110","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２－４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1",,,"799","1","3","45","1970",,,"1",,,,,,,,"NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199790800","ｵｶ ﾓﾘﾏｻ","丘　守正","3","20",,,"","99","4","03","1991","029-274-7110","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２－４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1",,,"799","1","3","45","1970",,,"1",,,,,,,,"NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"
"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田　茜",,,,,,"99",,,,,,,,"00000000000","00","000",,"00000000","00000000","99","9","2","5","6","799","1",,,,,"0148106500","1",,,,,"4","23","2011","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 16:16:43","com_dr_mapper","2017/10/08 16:16:43","com_dr_mapper"

1 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
2 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 com_dr_mapper 2023/04/12 00:00:00 com_dr_mapper
3 0199430100 ｶﾝﾏ ｾｲｷ 菅間　正気 3 16 01 14 19410114 37 045-625-2067 ｶﾅｶﾞﾜｹﾝ ﾖｺﾊﾏｼ ﾅｶｸ ﾔﾏﾃﾁﾖｳ 126-1 ｸﾚｽﾄﾔﾏﾃ 306 神奈川県横浜市中区山手町１２６－１　クレスト山手３０６ 231-0862 14104094000 14 104 126-1-306 08100700 04050300 37 1 1 011 1 3 44 1969 1 3 44 1969 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
4 0199578300 ﾌﾅｺｼ ﾏｻﾉﾌﾞ 船越　正信 3 29 01 06 19540106 53 00000000000 00 000 00000000 00000000 55 2 1 7 039 1 3 53 1978 1 02 A05 20051003 3 53 1978 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
5 0199768200 ｶﾜｻｷ ﾐｷｺ 川崎　三紀子 3 46 10 03 19711003 99 03-3579-1698 ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301 東京都板橋区本町６－３－３０１ 173-0001 13119047000 13 119 6-3-301 07070600 03030200 99 2 2 057 1 4 11 1999 1 1 4 11 1999 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
6 0199790600 ｵｶ ﾓﾘﾏｻ 丘　守正 3 20 03 11 19450311 99 4 03 1991 029-274-7110 ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 茨城県ひたちなか市大字三反田３８９２－４ 312-0021 08221095000 08 221 3892-4 08071100 03060500 31 1 1 799 1 3 45 1970 1 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
7 0199961300 0199790700 ﾌｼﾞﾀ ｱｶﾈ ｵｶ ﾓﾘﾏｻ 藤田　茜 丘　守正 03 11 0311 99 4 03 1991 029-274-7110 ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 茨城県ひたちなか市大字三反田３８９２－４ 312-0021 00000000000 08221095000 00 08 000 221 3892-4 00000000 08071100 00000000 03060500 99 31 9 1 2 1 5 6 799 1 3 45 1970 0148106500 1 4 23 2011 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
8 0199790800 ｵｶ ﾓﾘﾏｻ 丘　守正 3 20 99 4 03 1991 029-274-7110 ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4 茨城県ひたちなか市大字三反田３８９２－４ 312-0021 08221095000 08 221 3892-4 08071100 03060500 31 1 1 799 1 3 45 1970 1 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper
9 0199961300 ﾌｼﾞﾀ ｱｶﾈ 藤田　茜 99 00000000000 00 000 00000000 00000000 99 9 2 5 6 799 1 0148106500 1 4 23 2011 NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2017/10/08 16:16:43 com_dr_mapper 2017/10/08 16:16:43 com_dr_mapper

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

@ -43,9 +43,20 @@ class UltmarcDoctorInfoViewModel(BaseModel):
# 生年月日
def is_input_birthday_format(self):
return self._format_date_string(self.doctor_info_data.birthday)
if self.doctor_info_data.birthday is None or len(self.doctor_info_data.birthday) == 0:
return ''
birthday = self.doctor_info_data.birthday.replace(" ", "")
if len(birthday) == 8:
# ８桁の場合、yyyy/mm/ddとする
return f'{birthday[0:4]}/{birthday[4:6]}/{birthday[6:8]}'
if len(birthday) == 4:
# ４桁の場合、mm/ddとする
return f'{birthday[0:2]}/{birthday[2:4]}'
# 規格外の場合は、空表示とする
return ''
# 利用停止区分
def is_input_use_stop_div_category_name(self):
if not self.doctor_info_data.use_stop_div:
return ''
@ -68,10 +79,6 @@ class UltmarcDoctorInfoViewModel(BaseModel):
return aply_start_date_string
return self._format_date(aply_start_date)
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_start_date = datetime.strptime(aply_start_date_string, '%Y%m%d')
return self._format_date(aply_start_date)
# 医師勤務先履歴_終了年月日
def is_input_his_aply_end_ymd_format(self, aply_end_date_string: str):
if not aply_end_date_string:
@ -83,10 +90,6 @@ class UltmarcDoctorInfoViewModel(BaseModel):
return aply_end_date_string
return self._format_date(aply_end_date)
# 医師勤務先履歴の適用開始年月日は文字列型なので、日付に変換してから渡す
aply_end_date = datetime.strptime(aply_end_date_string, '%Y%m%d')
return self._format_date(aply_end_date)
# DM不可フラグ
def is_input_notdm_flg_name(self, notdm_flg: str):
if not notdm_flg: