diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index 3c49c18b..810f045d 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, parameter.model_dump()) + result = self._database.execute_select(query, clone_parameter.model_dump()) models = [UltmarcDoctorDBModel(**r) for r in result] return models @@ -145,7 +145,8 @@ class UltmarcDoctorRepository(BaseRepository): # 利用停止区分 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)) + where_clauses.append(SQLCondition( + '', '', "(com_dr.use_stop_div NOT IN ('01','03','04') OR com_dr.use_stop_div IS NULL)", literal=True)) # 廃業除外 if where_clauses: diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html index 3f2dc1bf..7c219571 100644 --- a/ecs/jskult-webapp/src/templates/docSearch.html +++ b/ecs/jskult-webapp/src/templates/docSearch.html @@ -247,7 +247,16 @@ if(key=='dcf_dsf_inst_cd') inner_content = `${data['form_inst_name_kanji'] || ''}`; if(key=='use_stop_div') - inner_content = "{{ultmarc.is_input_use_stop_div_category_name(inner_content)}}" + if(inner_content == '01'){ + inner_content = '全面停止'; + }else if(inner_content == '03'){ + inner_content = '特定項目停止'; + }else if(inner_content == '04'){ + inner_content = '全DM停止'; + }else{ + inner_content = ''; + } + return `${inner_content || ''}` }); return ` diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html index 00f8e9ab..eb2a0e66 100644 --- a/ecs/jskult-webapp/src/templates/instInfo.html +++ b/ecs/jskult-webapp/src/templates/instInfo.html @@ -44,6 +44,7 @@
+