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

feat: アルトマーク情報照会画面のpydantic v2対応

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-07-31 11:52:25 +09:00
parent 96f29427a4
commit 682cc7f6b8
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
View File

@ -34,15 +34,15 @@ class UltmarcInstInfoDBModel(BaseDBModel):
insp_item_paras: Optional[str]
insp_item_biochem: Optional[str]
insp_item_ri: Optional[str]
prmit_bed_num_gen: Optional[str]
prmit_bed_num_rcup: Optional[str]
prmit_bed_num_mental: Optional[str]
prmit_bed_num_infection: Optional[str]
prmit_bed_num_tuber: Optional[str]
prmit_bed_num_other: Optional[str]
prmit_bed_num_sum: Optional[str]
prmit_bed_num_gen: Optional[int]
prmit_bed_num_rcup: Optional[int]
prmit_bed_num_mental: Optional[int]
prmit_bed_num_infection: Optional[int]
prmit_bed_num_tuber: Optional[int]
prmit_bed_num_other: Optional[int]
prmit_bed_num_sum: Optional[int]
ward_abolish_flg: Optional[str]
bed_num: Optional[str]
bed_num: Optional[int]
prmit_bed_maint_ymd: Optional[str]
inst_repre_cd: Optional[str]
inst_repre_kana: Optional[str]

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

@ -16,16 +16,16 @@ from src.system_var import environment
class UltmarcDoctorInfoViewModel(BaseModel):
subtitle: str = '医師情報'
is_batch_processing: Optional[bool]
doctor_info_data: Optional[UltmarcDoctorInfoDBModel]
trt_coursed_data: Optional[list[UltmarcDrTrtCourseDBModel]]
sosiety_data: Optional[list[UltmarcSosietyDBModel]]
specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]
doctor_wrkplace_his_data: Optional[list[UltmarcDoctorWrkplaceHisDBModel]]
doc_id: Optional[str]
post_cnt: Optional[int]
page_num: Optional[int]
is_batch_processing: bool = None
doctor_info_data: UltmarcDoctorInfoDBModel = None
trt_coursed_data: Optional[list[UltmarcDrTrtCourseDBModel]] = None
sosiety_data: Optional[list[UltmarcSosietyDBModel]] = None
specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]] = None
doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]] = None
doctor_wrkplace_his_data: Optional[list[UltmarcDoctorWrkplaceHisDBModel]] = None
doc_id: str = None
post_cnt: int = None
page_num: int = None
# 現在のページ（表示用）
def is_page_num_view(self):

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

@ -9,13 +9,13 @@ from src.system_var import environment
class UltmarcInstInfoViewModel(BaseModel):
subtitle: str = '施設情報'
is_batch_processing: Optional[bool]
inst_info_data: Optional[UltmarcInstInfoDBModel]
inst_trt_coursed_data: Optional[list[UltmarcInstTrtCourseDBModel]]
doctor_wrkplace_count: Optional[int]
inst_id: Optional[str]
post_cnt: Optional[int]
page_num: Optional[int]
is_batch_processing: bool = None
inst_info_data: UltmarcInstInfoDBModel = None
inst_trt_coursed_data: Optional[list[UltmarcInstTrtCourseDBModel]] = None
doctor_wrkplace_count: int = None
inst_id: str = None
post_cnt: int = None
page_num: int = None
# 未確認
def is_checked_unconf_flg(self):