コミット３

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:

ecs/jskult-webapp/src/templates/docSearch.html

@@ -247,7 +247,16 @@
                     if(key=='dcf_dsf_inst_cd')
                         inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}" onclick="OnLinkClick()">${data['form_inst_name_kanji']  || ''}</a>`;
                     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 = '全ＤＭ停止';
+                        }else{
+                            inner_content = '';
+                        }
+                    return `<td>${inner_content || ''}</td>`
                 });
                 return  `
                 <tr class="result_data">

ecs/jskult-webapp/src/templates/instInfo.html

@@ -44,6 +44,7 @@
             <form name="docSearch" method="post" action="/ultmarc/docSearch">
                 <td class="instHeaderTd">
                     <input type="hidden" name="ctrl_dcf_dsf_inst_cd" value="{{ultmarc.inst_info_data.dcf_dsf_inst_cd or ''}}">
+                    <input type="hidden" name="use_stop_div_ctrl" value="true">
                     <input name="docSearchBt" class="transitionBt" type="submit" value="勤務医師" {{ultmarc.is_disabled_doctor_wrkplace()}}>
                 </td>
             </form>