From 2df665d7bf6d6ac8f1f605e74381214551226d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 25 Aug 2023 17:00:20 +0900 Subject: [PATCH] =?UTF-8?q?fix:=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88web=E7=94=BB=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/view/ultmarc_doctor_info_view_model.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 d74ee6fe..4ed0537a 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 @@ -45,17 +45,18 @@ class UltmarcDoctorInfoViewModel(BaseModel): def is_input_birthday_format(self): if self.doctor_info_data.birthday is None or len(self.doctor_info_data.birthday) == 0: return '' - if len(self.doctor_info_data.birthday.replace(" ", "")) == 8: + birthday = self.doctor_info_data.birthday.replace(" ", "") + if len(birthday) == 8: # ８桁の場合、yyyy/mm/ddとする - return self._format_date_string(self.doctor_info_data.birthday) - if len(self.doctor_info_data.birthday.replace(" ", "")) == 4: - birthday = self.doctor_info_data.birthday.replace(" ", "") + return f'{birthday[0:4]}/{birthday[4:6]}/{birthday[6:8]}' + if len(birthday) == 4: # ４桁の場合、mm/ddとする - return '/'.join([birthday[0:2], birthday[2:4]]) + 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 ''