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 1609e7e3..9572bb5d 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 @@ -1,4 +1,3 @@ -from datetime import date from typing import Optional from src.model.db.base_db_model import BaseDBModel @@ -10,5 +9,5 @@ class UltmarcDoctorWrkplaceHisDBModel(BaseDBModel): blng_sec_name: Optional[str] univ_post_name: Optional[str] post_name: Optional[str] - aply_start_ymd: Optional[date] - aply_end_ymd: Optional[date] + aply_start_ymd: Optional[str] + aply_end_ymd: Optional[str] diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py index 4b3c0385..0c6c2827 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py @@ -8,7 +8,7 @@ logger = get_logger('COM_施設診療科目取得') class UltmarcInstTrtCourseRepository(BaseRepository): FETCH_SQL = """\ - SELECT trt_course_name_abb + SELECT com_trt_course.trt_course_name_abb FROM src05.com_inst JOIN src05.com_inst_trt_course ON com_inst.dcf_dsf_inst_cd = com_inst_trt_course.dcf_dsf_inst_cd LEFT JOIN src05.com_trt_course ON com_inst_trt_course.trt_course_cd = com_trt_course.trt_course_cd diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py index a88ffbbe..5709a361 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py @@ -8,7 +8,7 @@ logger = get_logger('COM_医師診療科目取得') class UltmarcDrTrtCourseRepository(BaseRepository): FETCH_SQL = """\ - SELECT trt_course_name + SELECT com_trt_course.trt_course_name FROM src05.com_dr LEFT JOIN src05.com_dr_trt_course ON com_dr.dcf_pcf_dr_cd = com_dr_trt_course.dcf_pcf_dr_cd LEFT JOIN src05.com_trt_course ON com_dr_trt_course.trt_course_cd = com_trt_course.trt_course_cd