From 28ce7054ba480c8fe1c0c2061cd1f1063945219a Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 3 Aug 2023 16:17:58 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8B=95=E4=BD=9C=E7=A2=BA=E8=AA=8D?= =?UTF-8?q?=E4=B8=AD=E3=81=AB=E7=99=BA=E7=94=9F=E3=81=97=E3=81=9F=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E5=9E=8B=E3=81=AE=E7=9B=B8=E9=81=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/db/ultmarc_doctor_wrkplace_his.py | 5 ++--- .../src/repositories/ultmarc_inst_trt_course_repository.py | 2 +- .../src/repositories/ultmarc_trt_course_repository.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) 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