From 682cc7f6b892156003828ca8719fef01ef0e5e53 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 31 Jul 2023 11:52:25 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=AB=E3=83=88=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E6=83=85=E5=A0=B1=E7=85=A7=E4=BC=9A=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AEpydantic=20v2=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/db/ultmarc_inst_info.py | 16 +++++++-------- .../view/ultmarc_doctor_info_view_model.py | 20 +++++++++---------- .../view/ultmarc_inst_info_view_model.py | 14 ++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py index 49739dc1..1d25bce5 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py @@ -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] diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py index f517e4a3..e74f5f62 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py @@ -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): diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py index 4244bef4..1adb5d55 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py @@ -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):