diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py index 6f20dfb9..7999de13 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py @@ -14,5 +14,6 @@ class UltmarcDoctorInfoDBModel(BaseDBModel): alma: Optional[str] hometown: Optional[str] grad_y: Optional[str] + use_stop_div: Optional[str] drday_y: Optional[str] estab_y: Optional[str] diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py index b0c8a5d1..103cd9f1 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py @@ -11,3 +11,4 @@ class UltmarcDoctorWrkplaceDBModel(BaseDBModel): univ_post_name: Optional[str] post_name: Optional[str] aply_start_ymd: Optional[date] + notdm_flg: Optional[str] diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py index 9572bb5d..04450f9a 100644 --- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py +++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py @@ -11,3 +11,4 @@ class UltmarcDoctorWrkplaceHisDBModel(BaseDBModel): post_name: Optional[str] aply_start_ymd: Optional[str] aply_end_ymd: Optional[str] + notdm_flg: 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 a92ea9e1..ab9546ad 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,6 +45,24 @@ class UltmarcDoctorInfoViewModel(BaseModel): def is_input_birthday_format(self): return self._format_date_string(self.doctor_info_data.birthday) + # 利用停止区分 + def is_input_use_stop_div_category_name(self): + if self.doctor_info_data.use_stop_div: + use_stop_div = self.doctor_info_data.use_stop_div + # 利用停止区分の文言設定 + # 01:全面的に利用停止 + # 03:特定の項目について利用停止 + # 04:全てのDM等利用停止 + if (use_stop_div == '01'): + return '全面的に利用停止' + if (use_stop_div == '03'): + return '特定の項目について利用停止' + if (use_stop_div == '04'): + return '全てのDM等利用停止' + return '' + else: + return '' + # 開始年月日 def is_input_aply_start_ymd_format(self, aply_start_date: datetime): if aply_start_date: @@ -70,6 +88,13 @@ class UltmarcDoctorInfoViewModel(BaseModel): else: return '' + # DM不可フラグ + def is_input_notdm_flg_name(self, notdm_flg: str): + if notdm_flg and notdm_flg == '1': + return '不可' + else: + return '' + def is_input_trt_course_data_size(self): return len(self.trt_coursed_data) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py index 0b122a39..01fea27f 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py @@ -113,11 +113,32 @@ class UltmarcDoctorSearchViewModel(BaseModel): return self.form_data.grad_y or '' # 利用停止区分 - def is_use_stop_div(self): + def is_checked_use_stop_div(self): if not self.is_form_submitted(): return 'checked' return self._checked_value(self.form_data.use_stop_div) + def is_input_use_stop_div(self): + if not self.is_form_submitted(): + return '' + return self.form_data.use_stop_div or '' + + def is_input_use_stop_div_category_name(self, use_stop_div: str): + if use_stop_div: + # 利用停止区分の文言設定 + # 01:全面停止 + # 03:特定項目停止 + # 04:全DM停止 + if (use_stop_div == '01'): + return '全面停止' + if (use_stop_div == '03'): + return '特定項目停止' + if (use_stop_div == '04'): + return '全DM停止' + return '' + else: + return '' + def disabled_button(self): return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else '' diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 44b0ab6b..3c49c18b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -56,7 +56,7 @@ class UltmarcDoctorRepository(BaseRepository): clone_parameter = UltmarcDoctorSearchModel(**parameter.model_dump()) where_clause = self.__build_condition(clone_parameter) query = self.FETCH_SQL.format(where_clause=where_clause) - result = self._database.execute_select(query, clone_parameter.model_dump()) + result = self._database.execute_select(query, parameter.model_dump()) models = [UltmarcDoctorDBModel(**r) for r in result] return models @@ -142,6 +142,11 @@ class UltmarcDoctorRepository(BaseRepository): parameter.grad_y = f'%{parameter.grad_y}%' where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y')) + # 利用停止区分 + if is_not_empty(parameter.use_stop_div) is False: + # 01・03・04を対象外とする + where_clauses.append(SQLCondition('', '', "(use_stop_div NOT IN ('01','03','04'))", literal=True)) + # 廃業除外 if where_clauses: where_clauses.append(SQLCondition( @@ -163,6 +168,7 @@ class UltmarcDoctorRepository(BaseRepository): com_alma.alma, com_hometown.hometown, com_dr.grad_y, + com_dr.use_stop_div, com_dr.drday_y, com_dr.estab_y FROM src05.com_dr diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py index 054c9d74..cd2464cd 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py @@ -16,7 +16,8 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository): univ_post.form_post_name as univ_post_name, post.form_post_name as post_name, com_dr_wrkplace_his.aply_start_ymd, - com_dr_wrkplace_his.aply_end_ymd + com_dr_wrkplace_his.aply_end_ymd, + com_dr_wrkplace_his.notdm_flg FROM src05.com_dr LEFT JOIN src05.com_dr_wrkplace_his ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace_his.dcf_pcf_dr_cd LEFT JOIN src05.com_inst ON com_dr_wrkplace_his.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py index 4798c467..0e98f64b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py @@ -16,7 +16,8 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): com_blng_sec.blng_sec_name, univ_post.form_post_name AS univ_post_name, post.form_post_name AS post_name, - com_dr_wrkplace.aply_start_ymd + com_dr_wrkplace.aply_start_ymd, + com_dr_wrkplace.notdm_flg FROM src05.com_dr LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html index 59a0f8ba..5a5be87a 100644 --- a/ecs/jskult-webapp/src/templates/docInfo.html +++ b/ecs/jskult-webapp/src/templates/docInfo.html @@ -94,6 +94,8 @@ 生年月日: + 利用停止区分: + @@ -185,6 +187,7 @@ 職位 開始年月日 終了年月日 + DM不可