feat: フォーマット修正
This commit is contained in:
shimoda.m@nds-tyo.co.jp
parent
1cc17f3116
commit
dbf7a98e66
@ -1,15 +1,17 @@
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
|
||||
from src.depends.services import get_service
|
||||
from src.model.internal.session import UserSession
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel, UltmarcDoctorInfoModel
|
||||
from src.model.request.ultmarc_inst import UltmarcInstModel, UltmarcInstInfoModel
|
||||
from src.model.request.ultmarc_doctor import (UltmarcDoctorInfoModel,
|
||||
UltmarcDoctorModel)
|
||||
from src.model.request.ultmarc_inst import (UltmarcInstInfoModel,
|
||||
UltmarcInstModel)
|
||||
from src.router.session_router import AuthenticatedRoute
|
||||
from src.services.batch_status_service import BatchStatusService
|
||||
from src.services.ultmarc_view_service import UltmarcViewService
|
||||
from src.services.session_service import set_session
|
||||
from src.services.ultmarc_view_service import UltmarcViewService
|
||||
from src.templates import templates
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
from typing import Optional
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from src.model.db.base_db_model import BaseDBModel
|
||||
from src.util.sanitize import sanitize
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
from typing import Optional
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from src.model.db.base_db_model import BaseDBModel
|
||||
from src.util.sanitize import sanitize
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from src.model.db.base_db_model import BaseDBModel
|
||||
from src.util.sanitize import sanitize
|
||||
|
||||
|
||||
@ -1,13 +1,16 @@
|
||||
from datetime import datetime, date
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel
|
||||
from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel
|
||||
from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel
|
||||
from src.model.db.ultmarc_specialist_license import UltmarcSpecialistLicenseDBModel
|
||||
from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel
|
||||
from src.model.db.ultmarc_doctor_wrkplace_his import UltmarcDoctorWrkplaceHisDBModel
|
||||
from src.model.db.ultmarc_doctor_wrkplace_his import \
|
||||
UltmarcDoctorWrkplaceHisDBModel
|
||||
from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel
|
||||
from src.model.db.ultmarc_specialist_license import \
|
||||
UltmarcSpecialistLicenseDBModel
|
||||
from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel
|
||||
from src.system_var import environment
|
||||
|
||||
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
import json
|
||||
from collections import OrderedDict
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
from src.model.db.prefc_master import PrefcMasterModel
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel
|
||||
from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel
|
||||
from src.system_var import environment
|
||||
|
||||
|
||||
|
||||
@ -1,13 +1,9 @@
|
||||
import json
|
||||
from collections import OrderedDict
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel
|
||||
from src.model.db.ultmarc_inst_trt_course import UltmarcInstTrtCourseDBModel
|
||||
|
||||
from src.system_var import environment
|
||||
|
||||
|
||||
|
||||
@ -4,10 +4,10 @@ from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
from src.model.db.prefc_master import PrefcMasterModel
|
||||
from src.model.db.inst_div_master import InstDivMasterModel
|
||||
from src.model.request.ultmarc_inst import UltmarcInstModel
|
||||
from src.model.db.prefc_master import PrefcMasterModel
|
||||
from src.model.db.ultmarc_inst import UltmarcInstDBModel
|
||||
from src.model.request.ultmarc_inst import UltmarcInstModel
|
||||
from src.system_var import environment
|
||||
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ from src.repositories.base_repository import BaseRepository
|
||||
class PrefcMasterRepository(BaseRepository):
|
||||
|
||||
FETCH_SQL = """\
|
||||
SELECT DISTINCT
|
||||
SELECT DISTINCT
|
||||
com_inst.prefc_cd AS prefc_cd,
|
||||
mst_prefc.prefc_name AS prefc_name
|
||||
FROM
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
from src.db import sql_condition as condition
|
||||
from src.db.sql_condition import SQLCondition
|
||||
from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel
|
||||
from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel
|
||||
from src.repositories.base_repository import BaseRepository
|
||||
from src.util.string_util import is_not_empty
|
||||
|
||||
@ -84,7 +84,7 @@ class UltmarcDoctorRepository(BaseRepository):
|
||||
# 必ず部分一致で検索
|
||||
parameter.dcf_dsf_inst_cd = f'%{parameter.dcf_dsf_inst_cd}%'
|
||||
where_clauses.append(SQLCondition(
|
||||
'com_inst.dcf_dsf_inst_cd', condition.LIKE, 'dcf_dsf_inst_cd'))
|
||||
'com_inst.dcf_dsf_inst_cd', condition.LIKE, 'dcf_dsf_inst_cd'))
|
||||
# 勤務先名(漢字)
|
||||
if is_not_empty(parameter.form_inst_name_kanji):
|
||||
# 必ず部分一致で検索
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
from src.model.db.ultmarc_doctor_wrkplace_his import UltmarcDoctorWrkplaceHisDBModel
|
||||
from src.model.db.ultmarc_doctor_wrkplace_his import \
|
||||
UltmarcDoctorWrkplaceHisDBModel
|
||||
from src.repositories.base_repository import BaseRepository
|
||||
|
||||
|
||||
class UltmarcDoctorWrkplaceHisRepository(BaseRepository):
|
||||
|
||||
FETCH_SQL = """\
|
||||
SELECT
|
||||
com_inst.dcf_dsf_inst_cd,
|
||||
com_inst.inst_name_kanji,
|
||||
com_blng_sec.blng_sec_name,
|
||||
univ_post.form_post_name as univ_post_name,
|
||||
post.form_post_name as post_name,
|
||||
com_dr_wrkplace_his.aply_start_ymd,
|
||||
SELECT
|
||||
com_inst.dcf_dsf_inst_cd,
|
||||
com_inst.inst_name_kanji,
|
||||
com_blng_sec.blng_sec_name,
|
||||
univ_post.form_post_name as univ_post_name,
|
||||
post.form_post_name as post_name,
|
||||
com_dr_wrkplace_his.aply_start_ymd,
|
||||
com_dr_wrkplace_his.aply_end_ymd
|
||||
FROM com_dr
|
||||
LEFT JOIN com_dr_wrkplace_his ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace_his.dcf_pcf_dr_cd
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel
|
||||
from src.model.db.ultmarc_doctor_wrkplace_count import UltmarcDoctorWrkplaceCountDBModel
|
||||
|
||||
from src.model.db.ultmarc_doctor_wrkplace_count import \
|
||||
UltmarcDoctorWrkplaceCountDBModel
|
||||
from src.repositories.base_repository import BaseRepository
|
||||
|
||||
|
||||
|
||||
@ -96,7 +96,7 @@ class UltmarcInstRepository(BaseRepository):
|
||||
where_clauses.append(SQLCondition('inst_addr', condition.LIKE, 'inst_addr'))
|
||||
|
||||
# 削除表示フラグ
|
||||
if is_not_empty(parameter.delFlg) == False:
|
||||
if is_not_empty(parameter.delFlg) is False:
|
||||
# 論理和での検索
|
||||
where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
from src.model.db.ultmarc_specialist_license import UltmarcSpecialistLicenseDBModel
|
||||
from src.model.db.ultmarc_specialist_license import \
|
||||
UltmarcSpecialistLicenseDBModel
|
||||
from src.repositories.base_repository import BaseRepository
|
||||
|
||||
|
||||
class UltmarcSpecialistLicenseRepository(BaseRepository):
|
||||
|
||||
FETCH_SQL = """\
|
||||
SELECT
|
||||
SELECT
|
||||
com_specialist_license.specialist_cd, com_specialist_license.specialist_license_name
|
||||
FROM src05.com_dr
|
||||
LEFT JOIN src05.com_sp_field ON com_dr.dcf_pcf_dr_cd = com_sp_field.dcf_pcf_dr_cd
|
||||
|
||||
@ -1,31 +1,31 @@
|
||||
import os.path as path
|
||||
import shutil
|
||||
from datetime import datetime
|
||||
|
||||
import pandas as pd
|
||||
|
||||
from src.aws.aws_api_client import AWSAPIClient
|
||||
from src.aws.s3 import S3Client
|
||||
from src.model.internal.session import UserSession
|
||||
from src.model.request.ultmarc_doctor import UltmarcDoctorModel
|
||||
from src.model.request.ultmarc_inst import UltmarcInstModel
|
||||
from src.model.view.ultmarc_doctor_info_view_model import \
|
||||
UltmarcDoctorInfoViewModel
|
||||
from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
|
||||
from src.model.view.ultmarc_inst_info_view_model import \
|
||||
UltmarcInstInfoViewModel
|
||||
from src.model.view.ultmarc_inst_view_model import UltmarcInstViewModel
|
||||
from src.model.view.ultmarc_inst_info_view_model import UltmarcInstInfoViewModel
|
||||
from src.model.view.ultmarc_doctor_info_view_model import UltmarcDoctorInfoViewModel
|
||||
from src.repositories.base_repository import BaseRepository
|
||||
from src.repositories.prefc_master_repository import PrefcMasterRepository
|
||||
from src.repositories.inst_master_repository import InstDivMasterRepository
|
||||
from src.repositories.ultmarc_inst_repository import UltmarcInstRepository
|
||||
from src.repositories.prefc_master_repository import PrefcMasterRepository
|
||||
from src.repositories.ultmarc_doctor_repository import UltmarcDoctorRepository
|
||||
from src.repositories.ultmarc_trt_course_repository import UltmarcTrtCourseRepository
|
||||
from src.repositories.ultmarc_inst_trt_course_repository import UltmarcInstTrtCourseRepository
|
||||
from src.repositories.ultmarc_sosiety_repository import UltmarcSosietyRepository
|
||||
from src.repositories.ultmarc_dr_wrkplace_repository import UltmarcDoctorWrkplaceRepository
|
||||
from src.repositories.ultmarc_dr_wrkplace_his_repository import UltmarcDoctorWrkplaceHisRepository
|
||||
from src.repositories.ultmarc_specialist_license_repository import UltmarcSpecialistLicenseRepository
|
||||
from src.repositories.ultmarc_dr_wrkplace_his_repository import \
|
||||
UltmarcDoctorWrkplaceHisRepository
|
||||
from src.repositories.ultmarc_dr_wrkplace_repository import \
|
||||
UltmarcDoctorWrkplaceRepository
|
||||
from src.repositories.ultmarc_inst_repository import UltmarcInstRepository
|
||||
from src.repositories.ultmarc_inst_trt_course_repository import \
|
||||
UltmarcInstTrtCourseRepository
|
||||
from src.repositories.ultmarc_sosiety_repository import \
|
||||
UltmarcSosietyRepository
|
||||
from src.repositories.ultmarc_specialist_license_repository import \
|
||||
UltmarcSpecialistLicenseRepository
|
||||
from src.repositories.ultmarc_trt_course_repository import \
|
||||
UltmarcTrtCourseRepository
|
||||
from src.services.base_service import BaseService
|
||||
from src.system_var import constants, environment
|
||||
|
||||
|
||||
class UltmarcViewService(BaseService):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user