nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:指摘内容を修正

Browse Source
This commit is contained in:
野間 2023-08-24 09:33:26 +09:00
parent 67838a754d
commit 995ea55da3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
View File

@ -57,8 +57,8 @@ class UltmarcDoctorRepository(BaseRepository):
# 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。 # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
clone_parameter = UltmarcDoctorSearchModel(**parameter.model_dump()) clone_parameter = UltmarcDoctorSearchModel(**parameter.model_dump())
where_clause = self.__build_condition(clone_parameter) where_clause = self.__build_condition(clone_parameter)
query = self.FETCH_SQL.format(where_clause=where_clause, limit=environment. query = self.FETCH_SQL.format(
ULTMARC_SEARCH_RESULT_MAX_COUNT + 1) where_clause=where_clause, limit=environment.ULTMARC_SEARCH_RESULT_MAX_COUNT + 1)
result = self._database.execute_select(query, clone_parameter.model_dump()) result = self._database.execute_select(query, clone_parameter.model_dump())
models = [UltmarcDoctorDBModel(**r) for r in result] models = [UltmarcDoctorDBModel(**r) for r in result]
@ -152,7 +152,7 @@ class UltmarcDoctorRepository(BaseRepository):
'', '', "(com_dr.use_stop_div NOT IN ('01','03','04') OR com_dr.use_stop_div IS NULL)", literal=True)) '', '', "(com_dr.use_stop_div NOT IN ('01','03','04') OR com_dr.use_stop_div IS NULL)", literal=True))
# 廃業除外 # 廃業除外
if where_clauses: if len(where_clauses) > 0:
where_clauses.append(SQLCondition( where_clauses.append(SQLCondition(
'', '', '(length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True)) '', '', '(length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True))
where_clauses.append(SQLCondition( where_clauses.append(SQLCondition(

4
ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
View File

@ -43,8 +43,8 @@ class UltmarcInstRepository(BaseRepository):
# 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。 # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
clone_parameter = UltmarcInstSearchModel(**parameter.model_dump()) clone_parameter = UltmarcInstSearchModel(**parameter.model_dump())
where_clause = self.__build_condition(clone_parameter) where_clause = self.__build_condition(clone_parameter)
query = self.FETCH_SQL.format(where_clause=where_clause, limit=environment. query = self.FETCH_SQL.format(
ULTMARC_SEARCH_RESULT_MAX_COUNT + 1) where_clause=where_clause, limit=environment.ULTMARC_SEARCH_RESULT_MAX_COUNT + 1)
result = self._database.execute_select(query, clone_parameter.model_dump()) result = self._database.execute_select(query, clone_parameter.model_dump())
models = [UltmarcInstDBModel(**r) for r in result] models = [UltmarcInstDBModel(**r) for r in result]