diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py index 8b9a52c6..ba06a443 100644 --- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py +++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py @@ -28,7 +28,7 @@ class UltmarcInstModel(BaseModel): ctrl_postal_number: str = Form(None), ctrl_inst_phone_number: str = Form(None), ctrl_prefc_cd: str = Form(None), - ctrl_delFlg: str = Form(None), + delFlg_ctrl: str = Form(None), ctrl_inst_addr: str = Form(None) ): return cls( @@ -39,7 +39,7 @@ class UltmarcInstModel(BaseModel): postal_number=ctrl_postal_number, inst_phone_number=ctrl_inst_phone_number, prefc_cd=ctrl_prefc_cd, - delFlg=ctrl_delFlg, + delFlg=delFlg_ctrl, inst_addr=ctrl_inst_addr ) diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 5860148c..bd89db0b 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -34,6 +34,8 @@ class UltmarcDoctorRepository(BaseRepository): LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd WHERE {where_clause} + AND (length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL) + AND (length(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL) GROUP BY com_dr.dcf_pcf_dr_cd, com_inst.dcf_dsf_inst_cd, com_blng_sec.blng_sec_cd ORDER BY com_dr.dcf_pcf_dr_cd, @@ -127,13 +129,6 @@ class UltmarcDoctorRepository(BaseRepository): parameter.grad_y = f'%{parameter.grad_y}%' where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y')) - # 検索条件が入力されていない場合 - # if not where_clauses: - # where_clauses.append(SQLCondition( - # '', '', '(LENGTH(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True)) - # where_clauses.append(SQLCondition( - # '', '', '(LENGTH(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)', literal=True)) - where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses]) return where_clauses_str diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index d44247c1..09f1a718 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -176,12 +176,12 @@ {% if bio.is_form_submitted() and bio.is_data_overflow_max_length() %}
- 検索結果が最大件数を超えました。検索条件を見直しして下さい。 + 検索件数が500件を超えています 検索項目を見直してください
{% endif %} {% if bio.is_form_submitted() and bio.is_data_empty() %}
- 対象のデータが存在しません。 + 対象のデータが存在しません
{% endif %} diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index 403b7f33..0b86e837 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -7,8 +7,6 @@