From 87364d7e83248c2ebae1b7b93b7210492b821499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 30 May 2023 14:34:50 +0900
Subject: [PATCH 01/24] =?UTF-8?q?=E5=8C=BB=E5=B8=AB=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E5=81=B4=E3=81=A0=E3=81=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |  90 +++
 ecs/jskult-webapp/src/main.py                 |   4 +-
 ecs/jskult-webapp/src/static/css/ultStyle.css | 671 ++++++++++++++++
 .../static/function/businessLogicScript.js    |  60 ++
 .../src/templates/docSearch.html              | 744 ++++++++++++++++++
 ecs/jskult-webapp/src/templates/menu.html     |   2 +-
 6 files changed, 1569 insertions(+), 2 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/controller/ultmarc.py
 create mode 100644 ecs/jskult-webapp/src/static/css/ultStyle.css
 create mode 100644 ecs/jskult-webapp/src/templates/docSearch.html

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
new file mode 100644
index 00000000..2f1bd5eb
--- /dev/null
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -0,0 +1,90 @@
+from typing import Optional
+
+from fastapi import APIRouter, Depends, HTTPException, Request
+from fastapi.exceptions import HTTPException
+from starlette import status
+
+from src.depends.services import get_service
+from src.model.internal.session import UserSession
+from src.model.request.bio import BioModel
+from src.model.view.bio_view_model import BioViewModel
+from src.router.session_router import AuthenticatedRoute
+from src.services.batch_status_service import BatchStatusService
+from src.services.bio_view_service import BioViewService
+from src.services.session_service import set_session
+from src.system_var import constants
+from src.templates import templates
+
+router = APIRouter()
+router.route_class = AuthenticatedRoute
+
+#########################
+# Views                 #
+#########################
+
+
+@router.get('/docSearch')
+def ultmarc_view(
+    request: Request,
+    # batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)),
+    # bio_service: BioViewService=Depends(get_service(BioViewService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+    # # 検索項目の取得
+    # bio = bio_service.prepare_bio_view(session)
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'docSearch.html', {
+            'request': request,
+            # 'bio': bio,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
+@router.post('/BioSearchList')
+def search_bio(
+    request: Request,
+    bio_form: Optional[BioModel] = Depends(BioModel.as_form),
+    bio_service: BioViewService = Depends(get_service(BioViewService)),
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
+):
+    # error_log(date("Y/m/d H:i:s") . " [INFO] UserId:" . $UserId . "\r\n", 3, "$execLog");
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    if batch_status_service.is_batch_processing():
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
+    # 生物由来データを検索
+    bio_sales_view_data = bio_service.search_bio_data(bio_form)
+    # 検索項目などのデータを取得
+    bio: BioViewModel = bio_service.prepare_bio_view(session)
+    bio.bio_data = bio_sales_view_data
+    bio.form_data = bio_form
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'bioSearchList.html', {
+            'request': request,
+            'bio': bio
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
diff --git a/ecs/jskult-webapp/src/main.py b/ecs/jskult-webapp/src/main.py
index f00f5ac3..a15344dc 100644
--- a/ecs/jskult-webapp/src/main.py
+++ b/ecs/jskult-webapp/src/main.py
@@ -5,7 +5,7 @@ from fastapi.staticfiles import StaticFiles
 from starlette import status
 
 import src.static as static
-from src.controller import bio, bio_download, healthcheck, login, logout, menu
+from src.controller import bio, bio_download, healthcheck, ultmarc, login, logout, menu
 from src.core import tasks
 from src.error.exception_handler import http_exception_handler
 from src.error.exceptions import UnexpectedException
@@ -22,6 +22,8 @@ app.include_router(logout.router, prefix='/logout')
 app.include_router(menu.router, prefix='/menu')
 # 生物由来関連のルーター
 app.include_router(bio.router, prefix='/bio')
+# アルトマークデータ照会のルーター
+app.include_router(ultmarc.router, prefix='/ultmarc')
 # 生物由来のダウンロード用APIルーター。
 # クライアントから非同期呼出しされるため、共通ルーターとは異なる扱いとする。
 app.include_router(bio_download.router, prefix='/bio')
diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css
new file mode 100644
index 00000000..936cef77
--- /dev/null
+++ b/ecs/jskult-webapp/src/static/css/ultStyle.css
@@ -0,0 +1,671 @@
+body {
+	background-color: LightCyan;
+	font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;
+}
+
+h1 {
+	font-size: 150%;
+	margin-left: 2%;
+	margin-top: 0%;
+	margin-bottom: 0%;
+}
+
+table{
+	border-collapse : collapse;
+}
+
+.header_bt{
+	width: 8%;
+	margin-bottom: 0.8%;
+	margin-left: 78.5%;
+}
+
+.search_textbox{
+	width: 100%;
+}
+
+.search_dropdown{
+	width: 100%;
+}
+
+.search_longtextbox{
+	width: 100%
+}
+
+.instSearchResult {
+	width: 100%;
+}
+
+.scroll_table{
+	overflow: auto;
+	white-space: nowrap;
+	margin-bottom: 2%;
+	/*スクロール時カラムが動く問題の修正 width: 100%;をコメントアウト*/
+	width: 100%;
+	height: 250px;
+}
+
+.scroll_table::-webkit-scrollbar {
+  height: 5px;
+  width: 10px;
+}
+
+.scroll_table::-webkit-scrollbar-track {
+  border-radius: 5px;
+  background: #eee;
+}
+
+.scroll_table::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background: #666;
+}
+
+.ult_bt {
+	width: 20%;
+	height: 80%;
+}
+
+.info_bt{
+	width: 10%
+}
+
+.search_bt{
+	margin-left: 3%;
+	margin-top: 0.8%;
+	margin-bottom: 0.8%;
+}
+
+.notFind{
+	margin-top: 5%;
+	text-align: center;
+	font-size: 150%;
+}
+
+.search_table {
+	margin-bottom: 1%;
+	padding-bottom: 1%;
+	border-bottom: solid 1px gray;
+	width: 100%;
+}
+
+.search_tb {
+	padding-right: 2%;
+	padding-top: 0.2%;
+	padding-bottom: 0.2%;
+}
+
+.leftSearch_tb{
+	width: 35%;
+}
+
+.batchMsg{
+	color: red;
+	font-size: 120%;
+	text-align: center;
+
+}
+
+._form {
+	width: 95%;
+	margin-left: 3%;
+}
+
+.result_info {
+	text-align: right;
+}
+
+/*施設検索一覧ヘッダー*/
+.instSearchHeaderTable{
+	width: 100%;
+}
+
+.instSearchHeaderTd{
+	width: 24%;
+}
+
+.instSearchHeaderTdCenter{
+	text-align: center;
+	width: 50%;
+}
+
+.instSearchHeaderTdRight{
+	text-align: right;
+	padding-right: 2%;
+}
+
+.instSearchButchMsg{
+	font-size: 80%;
+	color: red;
+}
+
+.instSearchHeader_bt{
+	width: 40%;
+}
+
+
+/*施設詳細*/
+.instInfoTable{
+	margin-top: 1%;
+	margin-left: 5%;
+	margin-right: 2%;
+	margin-bottom: 2%;
+	width: 93%;
+}
+
+.instInfoTableHalf1{
+	margin-top: 1%;
+	margin-left: 5%;
+	margin-right: 2%;
+	width: 93%;
+}
+
+.instInfoTableHalf2{
+	margin-top: -0.05%;
+	margin-left: 5%;
+	margin-right: 2%;
+	margin-bottom: 2%;
+	width: 93%;
+}
+
+.instInfoColumn {
+	width : 9%;
+	height: 40px;
+	background : rgb(225, 233, 250);
+	border : solid 1px;
+}
+
+.instData {
+	background : rgb(244, 244, 244);
+	border : solid 1px;
+	padding-left : 0.5%;
+	padding-right : 0.5%;
+	padding-top: 0.25%;
+	padding-bottom: 0.25%;
+}
+
+.instDataMid{
+	/*NO5修正前 width: 51%;*/
+	width: 20%;
+}
+
+/*NO5にて追加 START*/
+.instDataLarge{
+	width: 85%;
+}
+
+.instDataLeft{
+	width: 20%;
+}
+
+.instDataCenter{
+	width: 7%;
+}
+
+.instDataRight{
+	width: 25%;
+}
+/*NO5にて追加 END*/
+
+.instDataSmallTextbox{
+	width: 45%;
+}
+
+/*NO5にて追加 START*/
+.instDataCenterTextbox{
+	width: 80%;
+}
+/*NO5にて追加 END*/
+
+.instInfoTextbox{
+	width: 98%;
+	padding-right: 1%;
+	padding-left: 1%;
+}
+
+.instCdTextbox{
+	/*NO5修正前 width: 13%;*/
+	width: 35%;
+	margin-left: 0.5%;
+	margin-right: 2%;
+}
+
+.delReasonCdTextbox{
+	/*NO5修正前 width: 2%;*/
+	width: 5%;
+	margin-left: 0.5%;
+	margin-right: 1%;
+}
+
+.delReasonTextbox{
+	/*NO5修正前 width: 43%;*/
+	width: 88%;
+	margin-left: 0.5%;
+	margin-right: 2%;
+}
+
+.manageTextbox{
+	width: 40%;
+}
+
+.textboxMargin {
+	margin-left : 0.1%;
+}
+
+.transitionBt{
+	width: 98%;
+	height: 30px;
+}
+
+.instHeaderTable{
+	margin-left: 40%;
+}
+
+.instHeaderTd{
+	width: 10%;
+	font-size: 140%;
+	text-align: center;
+	padding-right: 2%;
+}
+
+.trtCourseTextbox{
+	width: 6%;
+}
+
+.bedTd{
+	width: 46%;
+}
+
+.bedTextbox{
+	width: 70%;
+}
+
+.xSmallTd{
+	width: 9%;
+}
+
+.xSmallTextbox{
+	width: 75%;
+}
+
+.reExamTd{
+	width: 13%;
+}
+
+.repreTd{
+	width: 50%;
+}
+
+.repreTextbox{
+	width: 95%;
+}
+
+.trtTextbox{
+	width: 5%;
+	margin-right: 1.2%;
+}
+
+.parentCdTextBox{
+	width: 15%;
+}
+
+.parentNameTextBox{
+	width: 75%;
+}
+
+.hpInfoColumn{
+	width : 12%;
+	height: 40px;
+	background : rgb(225, 233, 250);
+	border : solid 1px;
+}
+
+.hpAssrtTd{
+	width: 12%;
+}
+
+.hpAssrtTextbox{
+	width: 85%;
+}
+
+.border_bottom_none  {
+	border-bottom-style:none;
+}
+
+.numberBox{
+	text-align: right;
+}
+
+/*医師検索*/
+/*ヘッダー*/
+.docHeaderTable{
+	width: 100%;
+}
+
+.docHeaderTd{
+	width: 24%;
+}
+
+.docHeaderTdCenter{
+	text-align: center;
+	width: 50%;
+}
+
+.docHeaderTdRight{
+	text-align: right;
+	padding-right: 2%;
+}
+
+.docButchMsg{
+	/* font-size: 80%; */
+	color: red;
+}
+
+.docHeader_bt{
+	width: 40%;s
+}
+
+/* アルトマーク課題管理表No.2の修正 8% → 10% */
+/* アルトマーク課題管理表No.8の修正 10% → 14% */
+.docSearchColumnTd{
+	width: 14%;
+}
+
+.docSearchTextboxTd{
+	width: 18%;
+}
+
+.docSearchTextbox_td{
+	width: 94%;
+}
+
+.docSearchTextbox{
+	width: 90%;
+	margin-right: 5%;
+	margin-top: 0.8%;
+	margin-bottom: 0.8%;
+}
+
+.docSearchTableDivOne{
+	width: 100%;
+}
+
+.docSearchTableDivTwo{
+	margin-bottom: 1%;
+	padding-bottom: 1%;
+	border-bottom: solid 1px gray;
+	width: 100%;
+}
+
+.docSearchScroll{
+	overflow: auto;
+	white-space: nowrap;
+	margin-bottom: 2%;
+	width: 100%;
+	height: 270px;
+}
+
+.docSearchScroll::-webkit-scrollbar {
+  height: 5px;
+  width: 10px;
+}
+
+.docSearchScroll::-webkit-scrollbar-track {
+  border-radius: 5px;
+  background: #eee;
+}
+
+.docSearchScroll::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background: #666;
+}
+
+.allOnOffButton{
+	width: 6%;
+}
+
+/*医師情報*/
+.docInfoTable{
+	margin-top: 1%;
+	margin-left: 5%;
+	margin-right: 2%;
+	margin-bottom: 1%;
+	width: 93%;
+	border-bottom: solid 1px gray;
+}
+
+.docInfoTd{
+	padding-bottom: 0.5%;
+}
+
+.docInfoTextBox{
+	margin-left: 0.5%;
+	margin-right: 2%;
+	width: 8%;
+}
+
+.docInfoTrtTextBox{
+	margin-left: 0.5%;
+}
+
+.docBelongTable{
+	margin-left: 1%;
+	width: 98%;
+	border-bottom: solid 1px gray;
+}
+
+.docBelongTd{
+	width: 49%;
+	height: 150px;
+}
+
+.docSocietyTable{
+	width: 100%;
+}
+
+.scroll{
+	overflow: auto;
+	height: 120px;
+	width: 90%;
+	margin-left: 7%;
+	margin-bottom: 4%;
+}
+
+.scroll::-webkit-scrollbar {
+  height: 5px;
+  width: 10px;
+}
+
+.scroll::-webkit-scrollbar-track {
+  border-radius: 5px;
+  background: #eee;
+}
+
+.scroll::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background: #666;
+}
+
+.rightBoderLine{
+	border-right: solid 1px gray;
+}
+
+.wrkplaceH1{
+	margin-top: 0.3%;
+}
+
+.wrkplaceTable{
+	width: 100%;
+}
+
+
+
+
+
+
+
+/* 生物由来検索、施設検索共通*/
+
+
+
+.clear_bt{
+	margin-left: 120px;
+	width: 60px
+}
+
+.back_bt{
+	margin-left: 1042px;
+	width: 80px
+}
+
+.noLine{
+	text-decoration: none;
+}
+
+
+/*アルトマーク施設検索*/
+
+
+/*共通：アルトマーク施設検索,医師検索,施設詳細*/
+.maxWidth_tb {
+	width: 100%;
+}
+
+/*アルトマーク施設検索,医師検索共通*/
+
+.search_btTd {
+	text-align: right;
+}
+
+.selection {
+    display: none;
+}
+
+#page-1 {
+    display: block;
+}
+
+
+/*医師検索*/
+.search_middleTd {
+	padding-right: 25px;
+	width : 450px;
+}
+
+.docSearchScroll_div {
+	overflow: auto;
+	height: 200px;
+	width: 1132px;
+}
+
+/*共通:施設詳細、医師詳細*/
+.transition{
+	text-align: right;
+	margin-right: 60px;
+}
+
+
+
+
+
+.data_width_middle  {
+	width : 300px;
+}
+
+
+.border_top_none  {
+	border-top-style:none;
+}
+
+
+
+.textbox_margin_short {
+	margin-left : 5px;
+}
+
+.label_margin {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+
+/*医師詳細*/
+.docInfo_table{
+	margin-bottom: 30px;
+	border-bottom: solid 1px gray;
+	width: 1132px;
+}
+
+.small_tb{
+	width: 100px;
+}
+
+.docBelongScroll_div {
+	overflow: auto;
+	height: 100px;
+	width: 500px;
+	margin: 0px 30px 0px 30px;
+}
+
+.rightPadding_table{
+	padding-right: 50px;
+}
+
+
+.docPlaceScroll_div {
+	overflow: auto;
+	height: 150px;
+	width: 700px;
+	margin: 0px 30px 0px 30px;
+}
+
+.result_tr{
+	overflow-y: scroll;
+	overflow-x: scroll;
+}
+
+.result_data{
+	overflow-y: scroll;
+	overflow-x: scroll;
+	width: 50px;
+}
+
+/* tablesoter */
+table.tablesorter {
+	font-family:arial;
+	background-color: #CDCDCD;
+	font-size: 8pt;
+	text-align: left;
+}
+
+table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+	background-color: #e6EEEE;
+	border: 0.1px solid silver;
+	font-size: 8pt;
+	padding: 4px;
+	padding-right: 20px;
+}
+table.tablesorter thead tr .header {
+	background-image: url(bg.gif);
+	background-repeat: no-repeat;
+	background-position: center right;
+	cursor: pointer;
+}
+table.tablesorter tbody td {
+	color: #3D3D3D;
+	padding: 4px;
+	background-color: #FFF;
+	border: 0.1px solid silver;
+	vertical-align: top;
+}
+table.tablesorter tbody tr.odd td {
+	background-color:#F0F0F6;
+}
+table.tablesorter thead tr .headerSortUp {
+	background-image: url(asc.gif);
+}
+table.tablesorter thead tr .headerSortDown {
+	background-image: url(desc.gif);
+}
+table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
+	background-color: #8dbdd8;
+}
diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index 90ecc18b..f55e7858 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -211,3 +211,63 @@ function DisplayErrorDialog(strMesssage) {
     $("#errorTxt").html(strMesssage);
     $("#error").dialog("open");
 }
+
+/* ult.jsから移植 */
+// チェックボックス全選択関数
+// 条件：チェックボックスのクラス名に"selected"というのがついていること
+// 条件：ボタンにクラス名 send がついていること
+function allOn(){
+	$(".selected").prop("checked", true);
+	$(".send").prop('disabled',false);
+}
+
+// チェックボックス全解除関数
+// 条件：チェックボックスのクラス名に"selectedページ数"というのがついていること
+// 条件：ボタンにクラス名 send がついていること
+function allOff(){
+	$(".selected").prop("checked", false);
+	$(".send").prop('disabled',true);
+}
+
+// 検索結果のところのボタンをチェックが1個でも付いたら押せるようにして、チェックがなければ押せないようにする関数
+// 条件：チェックボックスのクラス名に"selected"というのがついていること
+// 条件：ボタンにクラス名 send がついていること
+function resultBtDisablead(){
+	var cnt1 = $('.checkNum input:checkbox:checked').length;
+	console.log(cnt1);
+    if(cnt1 == 0) {
+        $(".send").prop('disabled',true);
+    }
+    else {
+		$(".send").prop('disabled',false);
+    }
+}
+
+// Enter押下時にsubmitさせなくする
+$(function() {
+  $(document).on("keypress", "input:not(.allow_submit)", function(event) {
+    return event.which !== 13;
+  });
+});
+
+// 数字-以外を許さない入力チェック
+function checkNumberForm($this)
+{
+	var str=$this.value;
+	while(str.match(/[^\d\-]/))
+	{
+		str=str.replace(/[^\d\-]/,"");
+	}
+	$this.value=str;
+}
+
+// 数字以外を許さない入力チェック
+function checkNumberOnlyForm($this)
+{
+	var str=$this.value;
+	while(str.match(/[^\d]/))
+	{
+		str=str.replace(/[^\d]/,"");
+	}
+	$this.value=str;
+}
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
new file mode 100644
index 00000000..214ea399
--- /dev/null
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -0,0 +1,744 @@
+<?php
+require_once('/home/nds_dwh/webroot/common/config/ultIniSet.inc');
+require_once('/home/nds_dwh/webroot/common/function/sessionCheck.php');
+require_once('/home/nds_dwh/webroot/common/function/timeout.php');
+require_once('/home/nds_dwh/webroot/common/function/dbcls.php');
+require_once('/home/nds_dwh/webroot/common/config/path.inc');
+require_once('/home/nds_dwh/webroot/common/config/message.inc');
+require_once('/home/nds_dwh/webroot/common/function/getDateBatchJSString.php');
+?>
+
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    {% with subtitle = '医師検索一覧' %}
+    {% include '_header.html' %}
+    {% endwith  %}
+    <link rel="stylesheet" href="/static/css/ultStyle.css">
+    <link rel="stylesheet" href="/static/css/pagenation.css">
+    <link rel="stylesheet" href="/static/css/datepicker.css">
+    <script src="/static/lib/fixed_midashi.js"></script>
+
+	<!-- <link rel="stylesheet" type="text/css" href="<?php echo $ultCss ?>"> -->
+	<!-- <script type="text/javascript" src="<?php echo $ultJsPath ?>"></script> -->
+	<script type="text/javascript">
+		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
+
+		// function DisplayErrorDialog(strMesssage) {
+		// 	$( "#errorTxt" ).html( strMesssage );
+		// 	$("#error").dialog("open");
+		// }
+
+		// function CreateDialog() {
+		// 	$("#error").dialog({
+		// 	  autoOpen: false,
+		// 	  width: 400,
+		// 	  modal: true,
+		// 	  open: function (event, ui) {
+		// 	      $(".ui-dialog-titlebar-close").click(function(){
+		// 	      	$("#error").dialog("close");
+		// 	      	location.href = '<?php echo $logoutPath ?>';
+		// 		  });
+		// 	  },
+		// 	  buttons: [
+		// 	    {
+		// 	      text: 'OK',
+		// 	      click: function(){
+		// 	      	$("#error").dialog("close");
+		// 	      	location.href = '<?php echo $logoutPath ?>';
+		// 	      }
+		// 	    }
+		// 	  ]
+		// 	});
+		// }
+
+		// function imgLoad(){
+		// 	$(".ConfirmImg").attr("src","/common/css/image/kakunin.png");
+		// 	$(".ErrorImg").attr("src","/common/css/image/error.png");
+		// }
+
+		window.onload = function(){
+            // 見出し固定初期化
+            FixedMidashi.create();
+            // ボタン、テキストボックス初期化
+            formBtDisabled();
+
+			// メッセージダイアログ初期化
+			// CreateDialog();
+			// imgLoad();
+		}
+	</script>
+</head>
+<!-- <?php
+
+// 施設検索情報の削除 -->
+<!-- $_SESSION['instDelFlg'] = true;
+
+
+if (isset($_POST['docBackBt'])|| isset($_POST['currentPageNum'])) {
+	// 前回の検索結果をそのまま表示
+}
+else if (isset($_POST['search_bt'])) {
+	$_SESSION['docTextbox_1'] = htmlspecialchars($_POST['textbox_1'], ENT_QUOTES);
+	$_SESSION['docTextbox_2'] = htmlspecialchars($_POST['textbox_2'], ENT_QUOTES);
+	$_SESSION['docTextbox_3'] = htmlspecialchars($_POST['textbox_3'], ENT_QUOTES);
+	$_SESSION['docTextbox_4'] = htmlspecialchars($_POST['textbox_4'], ENT_QUOTES);
+	$_SESSION['docTextbox_5'] = htmlspecialchars($_POST['textbox_5'], ENT_QUOTES);
+	$_SESSION['docTextbox_6'] = htmlspecialchars($_POST['textbox_6'], ENT_QUOTES);
+	$_SESSION['docTextbox_7'] = htmlspecialchars($_POST['textbox_7'], ENT_QUOTES);
+	$_SESSION['docTextbox_8'] = htmlspecialchars($_POST['textbox_8'], ENT_QUOTES);
+	$_SESSION['docTextbox_9'] = htmlspecialchars($_POST['textbox_9'], ENT_QUOTES);
+	$_SESSION['docTextbox_10'] = htmlspecialchars($_POST['textbox_10'], ENT_QUOTES);
+	$_SESSION['docTextbox_11'] = htmlspecialchars($_POST['textbox_11'], ENT_QUOTES);
+
+} else if(isset($_POST['docSearchBt'])){
+	$_SESSION['docTextbox_1'] = null;
+	$_SESSION['docTextbox_2'] = null;
+	$_SESSION['docTextbox_3'] = null;
+	$_SESSION['docTextbox_4'] = $_POST['id'];
+	$_SESSION['docTextbox_5'] = null;
+	$_SESSION['docTextbox_6'] = null;
+	$_SESSION['docTextbox_7'] = null;
+	$_SESSION['docTextbox_8'] = null;
+	$_SESSION['docTextbox_9'] = null;
+	$_SESSION['docTextbox_10'] = null;
+	$_SESSION['docTextbox_11'] = null;
+
+} else{
+	$_SESSION['docTextbox_1'] = null;
+	$_SESSION['docTextbox_2'] = null;
+	$_SESSION['docTextbox_3'] = null;
+	$_SESSION['docTextbox_4'] = null;
+	$_SESSION['docTextbox_5'] = null;
+	$_SESSION['docTextbox_6'] = null;
+	$_SESSION['docTextbox_7'] = null;
+	$_SESSION['docTextbox_8'] = null;
+	$_SESSION['docTextbox_9'] = null;
+	$_SESSION['docTextbox_10'] = null;
+	$_SESSION['docTextbox_11'] = null;
+} -->
+
+
+<!-- // どのページを表示させるか -->
+<!-- if (isset($_POST['currentPageNum'])) {
+	$_SESSION['pageNumber'] = $_POST['currentPageNum'];
+} elseif (isset($_POST['instSearchBt']) || isset($_POST['docBackBt'])) {
+	// なにもしない
+} else {
+	$_SESSION['pageNumber'] = 1;
+}
+$pageNumber = $_SESSION['pageNumber'];
+
+// 表示するデータの位置決める
+$limit =  ($pageNumber - 1) * INST_DATA_PER_PAGE;
+$instDataPerPage = INST_DATA_PER_PAGE; -->
+
+<!-- // DB接続 -->
+<!-- $sqlCls = new sqlClass();
+$isDBSuccess = $sqlCls->dbConnection($dbs, $user, $pass, $docSearchPath, __LINE__);
+if (!isset($isDBSuccess)) {
+	$isDBSuccess = true; -->
+
+	<!-- // アルトマーク課題管理表No.2の追加 Start
+	$sql = "SELECT DISTINCT COM_INST.PREFC_CD, MST_PREFC.PREFC_NAME FROM COM_INST JOIN MST_PREFC ON COM_INST.PREFC_CD = MST_PREFC.PREFC_CD ORDER BY MST_PREFC.PREFC_CD";
+	$info = array($sql);
+	$prefc = $sqlCls->dbSelect($info, $docSearchPath, __LINE__);
+	if ($prefc == false) {
+		$isDBSuccess = false;
+	}
+	// アルトマーク課題管理表No.2の追加 End
+}
+?> -->
+
+
+<!--検索フォーム-->
+<body>
+		
+			<table class="docHeaderTable">
+				<tr>
+					<td class="docHeaderTd"><h1>医師検索一覧</h1></td>
+					<td class="docHeaderTdCenter docHeaderTdCenter">
+						<!-- <?php
+						// バッチ処理中判断
+						if(getDateBatchJSString($dbs, $user, $pass) && $isDBSuccess){
+						?> -->
+							<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+						<!-- <?php
+						} -->
+						<!-- ?> -->
+					</td>
+					<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
+				</tr>
+			</table>
+		</h1>
+	<form class="_form" name="search" action="/ultmarc/docSearch" method="POST">
+		<table class="docSearchTableDivTwo">
+			<tbody>
+				<tr>
+					<td class="docSearchColumnTd">医師コード:</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_1" value="
+                        " maxlength='10' oninput="formBtDisabled()">
+                        <!-- <?php if(isset($_SESSION['docTextbox_1'])) {
+							echo $_SESSION['docTextbox_1'];
+						}  ?> -->
+					</td>
+					<td class="docSearchColumnTd">氏名(漢字)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_2" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
+							echo $_SESSION["docTextbox_2"];
+						}  ?> -->
+					</td>
+					<!-- アルトマーク課題管理表No.8の修正 氏名(カナ)→氏名(かな・カナ) -->
+					<td class="docSearchColumnTd">氏名(かな・カナ)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_3" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
+							echo $_SESSION["docTextbox_3"];
+						}  ?> -->
+					</td>
+				</tr>
+				<tr>
+					<td class="docSearchColumnTd">勤務先コード：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_4" value="" maxlength='11' oninput="formBtDisabled()">
+                        <!-- <?php if(isset($_SESSION['docTextbox_4'])) {
+							echo $_SESSION['docTextbox_4'];
+						}  ?> -->
+					</td>
+					<td class="docSearchColumnTd">勤務先名(漢字)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_5" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_5"])) {
+							echo $_SESSION["docTextbox_5"];
+						}  ?> -->
+					</td>
+					<!-- アルトマーク課題管理表No.8の修正 勤務先名(カナ)→勤務先名(かな・カナ) -->
+					<td class="docSearchColumnTd">勤務先名(かな・カナ)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_6" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_6"])) {
+							echo $_SESSION["docTextbox_6"];
+						}  ?> -->
+					</td>
+				</tr>
+				<tr>
+					<!-- アルトマーク課題管理表No.2の追加 Start -->
+					<td class="docSearchColumnTd">勤務先都道府県：</td>
+					<td class="search_tb">
+						<!-- 都道府県のドロップダウン -->
+						<select class="text search_dropdown" name="textbox_11" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
+							<!--ToDo 都道府県ドロップダウンの中身を作成(マスタからとってこれる) -->
+							<option value=""></option>
+							<!-- <?php
+							foreach ($prefc as $value){
+							?>
+								<option value="<?php echo $value['PREFC_CD'] ?>" <?php if(isset($_SESSION['docTextbox_11'])) { if($_SESSION['docTextbox_11'] == $value['PREFC_CD']) { echo ' selected'; }};   ?> >
+								<?php echo $value['PREFC_NAME']; ?></option>
+							<?php
+							}
+							?> -->
+						</select>
+					</td>
+					<!-- アルトマーク課題管理表No.2の追加 End -->
+					<td class="docSearchColumnTd">所属部科(漢字)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_7" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_7"])) {
+							echo $_SESSION["docTextbox_7"];
+						}  ?> -->
+					</td>
+					<td class="docSearchColumnTd">診療科目(漢字)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_8" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_8"])) {
+							echo $_SESSION["docTextbox_8"];
+						}  ?> -->
+					</td>
+				</tr>
+				<tr>
+					<td class="docSearchColumnTd">出身大学(漢字)：</td>
+					<td class="docSearchTextboxTd">
+						<input class="text docSearchTextbox" type="text" name="textbox_9" value="" oninput="formBtDisabled(controlCount)">
+                        <!-- <?php if(isset($_SESSION["docTextbox_9"])) {
+							echo $_SESSION["docTextbox_9"];
+						}  ?> -->
+					</td>
+					<td class="docSearchColumnTd">卒年：</td>
+					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_10" value="" maxlength='4' oninput="formBtDisabled(controlCount)"></td>
+                    <!-- <?php if(isset($_SESSION["docTextbox_10"])) {
+                        echo $_SESSION["docTextbox_10"];
+                    }  ?> -->
+					<td class="search_btTd" colspan="2">
+						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr(controlCount);">
+						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form>
+	<!-- <?php
+	// アルトマーク課題管理表No.2の修正(LEFT JOIN MST_PREFC…の2行追加&SELECT COM_DR.DCF_PCF_DR_CD…の最後の検索項目（MST_PREFC.PREFC_NAME）追加) 
+	// アルトマーク課題管理表No.7の修正 旧ソース：$cntSql = "SELECT COUNT(*) AS countNum FROM  (((((((COM_DR)
+	if ((isset($_POST['search_bt']) || isset($_POST['currentPageNum'])  || isset($_POST['docSearchBt']) || isset($_POST['docBackBt'])) && $isDBSuccess && isset($_SESSION['id'])) {
+		$cntSql = "SELECT COUNT(countNum) AS countNum FROM (SELECT COUNT(*) AS countNum FROM  (((((((COM_DR
+		LEFT JOIN MST_PREFC ON COM_DR.PREFC_CD = MST_PREFC.PREFC_CD)
+		LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
+		LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
+		LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
+		LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
+		LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD)
+		LEFT JOIN COM_POST ON COM_DR_WRKPLACE.POST_CD = COM_POST.POST_CD)
+		LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD
+		WHERE ";
+		// アルトマーク課題管理表No.7の修正 旧ソース：SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_INST.FORM_INST_NAME_KANJI, COM_INST.DCF_DSF_INST_CD, COM_BLNG_SEC.BLNG_SEC_NAME, COM_TRT_COURSE.TRT_COURSE_NAME, COM_POST.FORM_POST_NAME, COM_ALMA.ALMA, COM_DR.GRAD_Y, MST_PREFC.PREFC_NAME
+		$sql = "
+		SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_INST.FORM_INST_NAME_KANJI, COM_INST.DCF_DSF_INST_CD, COM_BLNG_SEC.BLNG_SEC_NAME, COM_TRT_COURSE.TRT_COURSE_NAME, COM_POST.FORM_POST_NAME, COM_ALMA.ALMA, COM_DR.GRAD_Y, MST_PREFC.PREFC_NAME, COM_DR_WRKPLACE.BLNG_SEC_CD
+		FROM (((((((COM_DR
+		LEFT JOIN MST_PREFC ON COM_DR.PREFC_CD = MST_PREFC.PREFC_CD)
+		LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
+		LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
+		LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
+		LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
+		LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD)
+		LEFT JOIN COM_POST ON COM_DR_WRKPLACE.POST_CD = COM_POST.POST_CD)
+		LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD
+		WHERE ";
+		$notfirstFlg = false;
+		// もし医師コードが入力されていたら
+		if (!empty($_SESSION["docTextbox_1"])) {
+			$cntSql .= "COM_DR.DCF_PCF_DR_CD LIKE :drCd";
+			$sql .= "COM_DR.DCF_PCF_DR_CD LIKE :drCd";
+			$val[":drCd"] = '%' . htmlspecialchars($_SESSION['docTextbox_1'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし医師名（漢字）が入力されていたら
+		if (!empty($_SESSION["docTextbox_2"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "DR_NAME LIKE :drName";
+			$sql .= "DR_NAME LIKE :drName";
+			$val[":drName"] = '%' . htmlspecialchars($_SESSION['docTextbox_2'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし医師名(カナ)が入力されていたら
+		if (!empty($_SESSION["docTextbox_3"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "DR_NAME_KANA LIKE :drNameKana";
+			$sql .= "DR_NAME_KANA LIKE :drNameKana";
+			$val[":drNameKana"] = '%' .  htmlspecialchars(mb_convert_kana($_SESSION['docTextbox_3'], "khs", "UTF-8"), ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし勤務先コードが入力されていたら
+		if (!empty($_SESSION["docTextbox_4"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "COM_INST.DCF_DSF_INST_CD LIKE :instCd";
+			$sql .= "COM_INST.DCF_DSF_INST_CD LIKE :instCd";
+			$val[":instCd"] = '%' . htmlspecialchars($_SESSION['docTextbox_4'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし勤務先名(漢字)が入力されていたら
+		if (!empty($_SESSION["docTextbox_5"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "FORM_INST_NAME_KANJI LIKE :instNameKanji";
+			$sql .= "FORM_INST_NAME_KANJI LIKE :instNameKanji";
+			$val[":instNameKanji"] = '%' . htmlspecialchars($_SESSION['docTextbox_5'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし勤務先名(カナ)が入力されていたら
+		if (!empty($_SESSION["docTextbox_6"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "FORM_INST_NAME_KANA LIKE :instNameKana";
+			$sql .= "FORM_INST_NAME_KANA LIKE :instNameKana";
+			$val[":instNameKana"] = '%' . htmlspecialchars(mb_convert_kana($_SESSION['docTextbox_6'], "khs", "UTF-8"), ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// アルトマーク課題管理表No.2の追加 Start
+		// もし都道府県が入力されていたら
+		if ($_SESSION["docTextbox_11"] != null) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "COM_INST.PREFC_CD = :prefcCd";
+			$sql .= "COM_INST.PREFC_CD = :prefcCd";
+			$val[":prefcCd"] = htmlspecialchars($_SESSION['docTextbox_11'], ENT_QUOTES);
+			$notfirstFlg = true;
+		}
+		// アルトマーク課題管理表No.2の追加 End
+		// もし所属部科(漢字)が入力されていたら
+		if (!empty($_SESSION["docTextbox_7"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "COM_BLNG_SEC.BLNG_SEC_NAME LIKE :blngSecName";
+			$sql .= "COM_BLNG_SEC.BLNG_SEC_NAME LIKE :blngSecName";
+			$val[":blngSecName"] = '%' .  htmlspecialchars($_SESSION['docTextbox_7'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし診療科目（漢字）が入力されていたら
+		if (!empty($_SESSION["docTextbox_8"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "TRT_COURSE_NAME LIKE :trtCourseName";
+			$sql .= "TRT_COURSE_NAME LIKE :trtCourseName";
+			$val[":trtCourseName"] = '%' .  htmlspecialchars($_SESSION['docTextbox_8'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし出身大学（漢字）が入力されていたら
+		if (!empty($_SESSION["docTextbox_9"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "ALMA LIKE :alma";
+			$sql .= "ALMA LIKE :alma";
+			$val[":alma"] = '%' . htmlspecialchars($_SESSION['docTextbox_9'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+		// もし卒年が入力されていたら
+		if (!empty($_SESSION["docTextbox_10"])) {
+			if ($notfirstFlg) {
+				$cntSql .= " AND ";
+				$sql .= " AND ";
+			}
+			$cntSql .= "GRAD_Y LIKE :gradY";
+			$sql .= "GRAD_Y LIKE :gradY";
+			$val[":gradY"] = htmlspecialchars($_SESSION['docTextbox_10'], ENT_QUOTES) . '%';
+			$notfirstFlg = true;
+		}
+
+		// テキストボックスが未入力なら
+		
+		// アルトマーク課題管理表No.7の修正
+		//if (!(empty($_SESSION["docTextbox_1"]) AND empty($_SESSION["docTextbox_2"]) AND empty($_SESSION["docTextbox_3"]) AND empty($_SESSION["docTextbox_4"]) AND empty($_SESSION["docTextbox_5"]) AND empty($_SESSION["docTextbox_6"]) AND empty($_SESSION["docTextbox_7"]) AND empty($_SESSION["docTextbox_8"]) AND empty($_SESSION["docTextbox_9"]) AND empty($_SESSION["docTextbox_10"]))) {
+		if (!(empty($_SESSION["docTextbox_1"]) AND empty($_SESSION["docTextbox_2"]) AND empty($_SESSION["docTextbox_3"]) AND empty($_SESSION["docTextbox_4"]) AND empty($_SESSION["docTextbox_5"]) AND empty($_SESSION["docTextbox_6"]) AND empty($_SESSION["docTextbox_7"]) AND empty($_SESSION["docTextbox_8"]) AND empty($_SESSION["docTextbox_9"]) AND empty($_SESSION["docTextbox_10"]) AND empty($_SESSION["docTextbox_11"]))) {
+			$sql .=" AND (LENGTH(COM_INST.ABOLISH_YMD) = 0 OR COM_INST.ABOLISH_YMD IS NULL)
+					AND (LENGTH(COM_DR.ABOLISH_YMD) = 0 OR COM_DR.ABOLISH_YMD IS NULL)";
+
+			$cntSql .=" AND (LENGTH(COM_INST.ABOLISH_YMD) = 0 OR COM_INST.ABOLISH_YMD IS NULL)
+					AND (LENGTH(COM_DR.ABOLISH_YMD) = 0 OR COM_DR.ABOLISH_YMD IS NULL)
+					GROUP BY COM_DR.DCF_PCF_DR_CD, COM_INST.DCF_DSF_INST_CD) AS A;"; // アルトマーク課題管理表No.7の修正 GROUP BY ～の1行追加
+					
+			// ソートの基準設定
+			// アルトマーク課題管理表No.7の修正
+			//$sql .= " ORDER BY COM_DR.DCF_PCF_DR_CD";
+			$sql .= " ORDER BY COM_DR.DCF_PCF_DR_CD, COM_DR_WRKPLACE.DCF_DSF_INST_CD, COM_DR_WRKPLACE.BLNG_SEC_CD,COM_DR_TRT_COURSE.TRT_COURSE_CD";
+			// アルトマーク課題管理表No.7の修正
+			//$sql .=" LIMIT {$limit} , {$instDataPerPage};";
+		} else {
+			$sql .= ";";
+			$cntSql .= ";";
+		}
+
+		// 取得件数を計算
+		$info = array($cntSql, $val);
+		$dtCnt = $sqlCls->dbCount($info, $docSearchPath, __LINE__);
+		if ($dtCnt == false) {
+			$isDBSuccess = false;
+		}
+
+		// 件数が500以上かどうか
+		if ($dtCnt['countNum'] > 500) {
+			$resultMaxFlg = true;
+			$dtCnt['countNum'] = 0;
+			$selectDt = array();
+		} else {
+			$resultMaxFlg = false;
+			// データを取得
+			$info = array($sql, $val);
+			$selectDt = $sqlCls->dbSelect($info, $docSearchPath, __LINE__);
+			if ($selectDt == false) {
+				$isDBSuccess = false;
+			}
+		}
+	} else{
+		$resultMaxFlg = false;
+		$dtCnt['countNum'] = 0;
+		$selectDt = array();
+	}
+
+	if (!$isDBSuccess) {
+		$selectDt = array();
+		$dtCnt['countNum'] = 0;
+	}
+
+
+	$sqlCls->dbExit();
+	// ページ数の計算
+	$pageCount = ceil( $dtCnt['countNum'] / INST_DATA_PER_PAGE );
+
+	?> -->
+	<!--検索結果-->
+	<form class="_form" name="result" action="/ultmarc/docSearch" method="POST">
+		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
+        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
+		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
+        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
+		<!--検索件数-->
+		<!-- <div class="result_info">件数：<?php echo $dtCnt['countNum']; ?>件 ページ数：<?php echo "$pageCount"; ?><br></div> -->
+		<!--ページネーション-->
+		<div id="light-pagination" class="pagination"></div>
+		<!--検索結果表示テーブル-->
+		<div class="docSearchScroll">
+			<table class="tablesorter instSearchResult" _fixedhead="rows:1; cols:1">
+				<thead>
+					<tr>
+						<th></th>
+						<th>医師コード</th>
+						<th>氏名</th>
+						<th>勤務先名</th>
+						<th>所属部科</th>
+						<th>診療科目</th>
+						<th>役職名</th>
+						<th>出身大学</th>
+						<th>卒年</th>
+					</tr>
+				</thead>
+				<!-- <?php
+				if (isset($_POST['search_bt']) || isset($_POST['currentPageNum']) || isset($_POST['docSearchBt']) || isset($_POST['docBackBt'])) {
+				?> -->
+                    <tbody id="result_data" class="result_data"></tbody>
+					<!-- <tbody>
+						<?php
+						// アルトマーク課題管理表No.7の修正 Start
+						// 同じ所属部課で複数の診療科目を担当する医師情報をマージする
+						$selectDtMerge = array();
+						$beforeDrCd = "";
+						$beforeInstCd = "";
+						$beforeSecCd = "";
+						$limitCount = 0;
+						$pageLastProcEndFlag = false; -->
+						
+						<!-- foreach ($selectDt as $value) {
+
+							// 該当ページ内のデータであるかの判定 -->
+							<!-- if ($limit > $limitCount || $limitCount >= $limit + $instDataPerPage) {
+
+								if ($beforeDrCd != $value['DCF_PCF_DR_CD'] || $beforeInstCd != $value['DCF_DSF_INST_CD'] || $beforeSecCd != $value['BLNG_SEC_CD']) {
+									$beforeDrCd = $value['DCF_PCF_DR_CD'];
+									$beforeInstCd = $value['DCF_DSF_INST_CD'];
+									$beforeSecCd = $value['BLNG_SEC_CD'];
+									$limitCount++;
+								}
+								
+								// 該当ページ内のデータでない場合一覧表示対象ではないのでスキップ
+								continue;
+							} -->
+							
+							<!-- // 同じ医師情報の場合 -->
+							<!-- if ($beforeDrCd === $value['DCF_PCF_DR_CD'] && $beforeInstCd === $value['DCF_DSF_INST_CD'] && $beforeSecCd === $value['BLNG_SEC_CD']) {
+								// 医師情報が設定されていない場合、前のページの最後の医師データなのでスキップ
+								if (count($selectDtMerge) == 0) {
+									$limitCount++;
+									continue;
+								}
+								
+								// 診療科目以外同じ情報という前提で、診療科目だけをマージ（・で区切って追加）
+                                ※　SQLで取りましょう
+								$selectDtMerge[count($selectDtMerge) - 1]['TRT_COURSE_NAME'] .= $delimiterTrtCourceName . $value['TRT_COURSE_NAME'];
+							} -->
+							<!-- // 異なる医師情報の場合
+							else {
+								// 該当ページ内の最後のデータで、同じ医師情報がない場合、該当ページの処理は終わり
+								if ($pageLastProcEndFlag) {
+									$limitCount++;
+									$pageLastProcEndFlag = false;
+									continue;
+								}
+
+								// 医師情報を追加
+								$selectDtMerge[] = $value;
+								$beforeDrCd = $value['DCF_PCF_DR_CD'];
+								$beforeInstCd = $value['DCF_DSF_INST_CD'];
+								$beforeSecCd = $value['BLNG_SEC_CD'];
+								
+								// 該当ページ内の最後のデータの場合、同じ医師情報がある可能性があるので次のデータを検索する為にカウントアップしない
+								if ($limitCount === $limit + $instDataPerPage - 1) {
+									$pageLastProcEndFlag = true;
+								}
+								else {
+									$limitCount++;
+								}
+								
+							}
+						} -->
+						<!-- // アルトマーク課題管理表No.7の修正 End
+						
+						$i = 0;  // チェックボックスの名前つけに利用
+						// アルトマーク課題管理表No.7の修正
+						//foreach ($selectDt as $value) {
+						foreach ($selectDtMerge as $value) {
+							$i++;
+							?>
+							<tr>
+								<td><div class="checkNum"><input type="checkbox" class="checkbox selected" name="data<?php echo $i ?>"  onclick="resultBtDisablead()" value="<?php echo $value['DCF_PCF_DR_CD'] ?>"></div></td>
+								<td><a href="<?php echo $docInfoPath . "/?id=" . $value['DCF_PCF_DR_CD'] ?>"><?php echo $value['DCF_PCF_DR_CD'] ?></a></td>
+								<td><?php echo $value['DR_NAME'] ?></td>
+								<td><a href="<?php echo $instInfoPath . "/?id=" . $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['FORM_INST_NAME_KANJI'] ?></a></td>
+								<td><?php echo $value['BLNG_SEC_NAME'] ?></td>
+								<td><?php echo $value['TRT_COURSE_NAME'] ?></td>
+								<td><?php echo $value['FORM_POST_NAME'] ?></td>
+								<td><?php echo $value['ALMA'] ?></td>
+								<td><?php echo $value['GRAD_Y'] ?></td>
+							</tr>
+							<?php
+						}
+						?> -->
+					<!-- </tbody>
+				<?php
+				}
+				?> -->
+			</table>
+            
+			<!-- 
+    
+                ※　ここに埋めよう
+            <?php
+			if ($resultMaxFlg  && $isDBSuccess) {
+			?>
+				<div class="notFind"><?php echo $resultMaxMsg ?></div>
+			<?php
+			} else if (isset($_POST['search_bt']) && $dtCnt['countNum'] <= 0  && $isDBSuccess){
+			?>
+				<div class="notFind"><?php echo $notFindMsg ?></div>
+			<?php
+			} ?> -->
+		</div>
+		<!--操作ボタン-->
+		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報">
+	</form>
+
+	<!-- ダイアログ -->
+	<!-- <div id="error" title="エラー">
+		<div style="float: left;width: 15%"><img class="ErrorImg" style="width: 50px;" src="/common/css/image/error.png"></div>
+		<div id="errorTxt" style="float: right; white-space: normal; width: 300px;"></div>
+	</div> -->
+	<!-- <?php
+	// DBエラーしていないか
+	if(!$isDBSuccess){
+		print "<script language=javascript>CreateDialog();</script>";
+		print "<script language=javascript>DisplayErrorDialog('$dbErrMsg');</script>";
+	}
+	?> -->
+
+    <!-- DB接続失敗エラーモーダル -->
+    <!-- {% with 
+        modal_id='ErrorModal_DB',
+        modal_title='エラー',
+        message='DB接続に失敗しました。管理者にお問い合わせください。',
+        icon_key='warning',
+        modal_close_event='location.href="/logout?reason="',
+        buttons = [
+            {
+                'id': 'error_modal_db',
+                'class': 'btn btn-primary',
+                'text': 'OK',
+                'onclick_event': 'location.href="/logout?reason=''"'
+            }
+        ]
+    %}
+    {% include '_modal.html' %}
+    {% endwith %} -->
+
+	<script type="text/javascript">
+        // <! --ページネーションの作成-- >
+        $(function() {
+            // スピナー出さない場合は以下、エスケープせず埋め込む
+            // {% autoescape False%}
+            let searchResultString = '{}'
+            // {% endautoescape%}
+            const searchResultData = JSON.parse(searchResultString)
+            if (searchResultData.length == 0) {
+                return
+            }
+            $(".pagination").pagination({
+                // 以下はテスト用コード
+                dataSource: function(done) {
+                    done(searchResultData)
+                },
+                pageNumber: 1, // 初期ページ番号
+                pageSize: 50, //表示するコンテンツ数
+                pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
+                ellipsisText: '...', //省略文字
+                prevText: 'Prev', //「前へ」の文字。エスケープ文字
+                nextText: 'Next', //「次へ」の文字。エスケープ文字
+                showNavigator: true,
+                formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
+                callback: function(data, pagination) {
+                    $('#result_data').html(pagination_content(data))
+                }
+            })
+        });
+        
+        function pagination_content(datas) {
+            const display_keys = [
+                'slip_org_kbn',
+                'slip_mgt_no',
+                'rec_ymd',
+                'rec_whs_cd',
+                'rec_whs_sub_cd',
+                'whs_nm',
+                'rec_whs_org_cd',
+                'rec_urag_no',
+                'rev_hsdnymd_srk',
+                'rec_tran_kbn',
+                'tran_kbn_nm',
+                'mkr_cd',
+                'rec_comm_cd',
+                'comm_nm',
+                'whs_rep_comm_nm',
+                'nnsk_cd',
+                'rec_nnskfcl_nm',
+                'whs_rep_nnskfcl_nm',
+                'rec_nnsk_fcl_addr',
+                'whs_rep_nnsk_fcl_addr',
+                'rec_lot_num',
+                'amt_fugo',
+                'expr_dt',
+                'data_kbn',
+                'lot_no_err_flg',
+                'bef_slip_mgt_no',
+                'ins_usr',
+                'ins_dt',
+                'inst_cd',
+                'inst_name_form',
+                'address',
+                'tel_no',
+                'v_whs_cd',
+                'v_whsorg_cd',
+                'whs_org_nm',
+                'v_tran_cd',
+                'iko_flg',
+            ];
+            const tableRow = document.createElement('tr')
+            return datas.map(function (data) {
+                return  `
+                <tr class="result_data">
+                    ${display_keys.map((key) =>`<td>${data[key] || ''}</td>`)}
+                </tr>
+                `
+            })
+            return tableRow
+        }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/menu.html b/ecs/jskult-webapp/src/templates/menu.html
index beda056b..58f05375 100644
--- a/ecs/jskult-webapp/src/templates/menu.html
+++ b/ecs/jskult-webapp/src/templates/menu.html
@@ -11,7 +11,7 @@
       <h1>MeDaCA<br/>機能メニュー</h1>
       <br><br>
       {% if menu.is_available_ult_doctor_menu() %}
-        <a href="{{docSearchPath}}" class="btn btn-primary btn-lg btn_width">Ultmarc照会（医師）</a><br><br>
+        <a href="/ultmarc/docSearch" class="btn btn-primary btn-lg btn_width">Ultmarc照会（医師）</a><br><br>
       {% endif %}
       {% if menu.is_available_ult_inst_menu() %}
         <a href="{{instSearchPath}}" class="btn btn-primary btn-lg btn_width">Ultmarc照会（施設）</a><br><br>

From f6050ee47170ef7a1eeba919165bfbbfff0d464d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 30 May 2023 16:19:32 +0900
Subject: [PATCH 02/24] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AF=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |   7 +-
 .../src/model/db/prefc_master.py              |   8 ++
 .../model/view/ultmarc_doctor_view_model.py   | 113 ++++++++++++++++++
 .../repositories/prefc_master_repository.py   |  31 +++++
 .../src/services/ultmarc_view_service.py      | 111 +++++++++++++++++
 .../src/templates/docSearch.html              |   8 +-
 6 files changed, 274 insertions(+), 4 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/db/prefc_master.py
 create mode 100644 ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
 create mode 100644 ecs/jskult-webapp/src/repositories/prefc_master_repository.py
 create mode 100644 ecs/jskult-webapp/src/services/ultmarc_view_service.py

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 2f1bd5eb..ed966685 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -11,6 +11,7 @@ from src.model.view.bio_view_model import BioViewModel
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
 from src.services.bio_view_service import BioViewService
+from src.services.ultmarc_view_service import UltmarcViewService
 from src.services.session_service import set_session
 from src.system_var import constants
 from src.templates import templates
@@ -27,14 +28,14 @@ router.route_class = AuthenticatedRoute
 def ultmarc_view(
     request: Request,
     # batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)),
-    # bio_service: BioViewService=Depends(get_service(BioViewService))
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
     # バッチ処理中の場合、機能を利用させない
     # if batch_status_service.is_batch_processing():
     #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
     # # 検索項目の取得
-    # bio = bio_service.prepare_bio_view(session)
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
     # セッション書き換え
     session.update(
         actions=[
@@ -46,7 +47,7 @@ def ultmarc_view(
     templates_response = templates.TemplateResponse(
         'docSearch.html', {
             'request': request,
-            # 'bio': bio,
+            'ultmarc': ultmarc,
         },
         headers={'session_key': session_key}
     )
diff --git a/ecs/jskult-webapp/src/model/db/prefc_master.py b/ecs/jskult-webapp/src/model/db/prefc_master.py
new file mode 100644
index 00000000..5010149e
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/prefc_master.py
@@ -0,0 +1,8 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+
+
+class PrefcMasterModel(BaseDBModel):
+    prefc_cd: Optional[str]
+    prefc_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
new file mode 100644
index 00000000..1e3cf236
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -0,0 +1,113 @@
+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.db.wholesaler_master import WholesalerMasterModel
+from src.model.request.bio import BioModel
+from src.model.view.bio_disp_model import BisDisplayModel
+from src.system_var import environment
+
+
+class UltmarcDoctorViewModel(BaseModel):
+    subtitle: str = '医師検索一覧'
+    batch_status: Optional[str]
+    prefc_models: list[PrefcMasterModel]
+    doctor_data: Optional[list[BisDisplayModel]] = []
+    form_data: Optional[BioModel]
+
+    def display_wholesaler_names(self):
+        display_names = [
+            f'{whs_model.rec_whs_cd}-{whs_model.rec_whs_sub_cd}:{whs_model.nm}'
+            for whs_model in self.whs_models
+        ]
+        return display_names
+
+    def ultmarc_data_json_str(self):
+        def date_handler(obj):
+            return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+        return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
+
+    # def is_selected_whs_name(self, selected_wholesaler):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     form_wholesaler_full_name = f'{self.form_data.wholesaler_code}-{self.form_data.wholesaler_sub_code}:{self.form_data.wholesaler_name}'
+    #     return self._selected_value(form_wholesaler_full_name, selected_wholesaler)
+
+    # def is_selected_org_kbn(self, selected_org_kbn):
+    #     if not self.is_form_submitted():
+    #         return ''
+    #     return self._selected_value(self.form_data.org_kbn, selected_org_kbn)
+
+    # def is_input_rec_ymd_from(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self._format_date_string(self.form_data.rec_ymd_from)
+
+    # def is_input_rec_ymd_to(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self._format_date_string(self.form_data.rec_ymd_to)
+
+    # def is_input_lot_num(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self.form_data.rec_lot_num or ''
+
+    # def is_selected_data_kbn(self, selected_data_kbn):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self._selected_value(self.form_data.data_kbn, selected_data_kbn)
+
+    def is_selected_prefc_cd(self, selected_prefc_cd):
+        if not self.is_form_submitted():
+            return ''
+        return ''
+        # return self._selected_value(self.form_data.maker_cd, selected_prefc_cd)
+
+    # def is_input_rev_hsdnymd_srk_from(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self._format_date_string(self.form_data.rev_hsdnymd_srk_from)
+
+    # def is_input_rev_hsdnymd_srk_to(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return self._format_date_string(self.form_data.rev_hsdnymd_srk_to)
+
+    # def is_checked_iko_flg(self):
+    #     if not self.is_form_submitted():
+    #         return ''
+
+    #     return 'checked' if self.form_data.ikoFlg else ''
+
+    def disabled_button(self):
+        return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
+
+    def is_form_submitted(self):
+        return self.form_data is not None
+
+    def is_data_empty(self):
+        return len(self.doctor_data) == 0
+
+    def is_data_overflow_max_length(self):
+        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+
+    def _format_date_string(self, date_string):
+        if date_string is None:
+            return ''
+        date = datetime.strptime(date_string, '%Y%m%d')
+        return date.strftime('%Y/%m/%d')
+
+    def _selected_value(self, form_value: str, current_value: str):
+        return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/prefc_master_repository.py b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py
new file mode 100644
index 00000000..a8cf288f
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py
@@ -0,0 +1,31 @@
+from src.model.db.prefc_master import PrefcMasterModel
+from src.repositories.base_repository import BaseRepository
+
+
+class PrefcMasterRepository(BaseRepository):
+
+    FETCH_SQL = """\
+    SELECT DISTINCT 
+        com_inst.prefc_cd AS prefc_cd,
+        mst_prefc.prefc_name AS prefc_name
+    FROM
+        src05.com_inst
+    JOIN src05.mst_prefc ON com_inst.prefc_cd = mst_prefc.prefc_cd
+    ORDER BY
+        mst_prefc.prefc_cd
+    """
+
+    def fetch_all(self) -> list[PrefcMasterModel]:
+        try:
+            self._database.connect()
+            result = self._database.execute_select(self.FETCH_SQL)
+            result_data = [res for res in result]
+            models = [PrefcMasterModel(**r) for r in result_data]
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] getOroshiData DB Error. ")
+            print(f"[ERROR] ErrorMessage: {e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
new file mode 100644
index 00000000..6d296f74
--- /dev/null
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -0,0 +1,111 @@
+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.bio import BioModel
+from src.model.view.bio_disp_model import BisDisplayModel
+from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
+from src.repositories.base_repository import BaseRepository
+from src.repositories.bio_sales_view_repository import BioSalesViewRepository
+from src.repositories.prefc_master_repository import PrefcMasterRepository
+from src.repositories.pharmacy_product_master_repository import \
+    PharmacyProductMasterRepository
+from src.repositories.wholesaler_master_repository import \
+    WholesalerMasterRepository
+from src.services.base_service import BaseService
+from src.system_var import constants, environment
+
+
+class UltmarcViewService(BaseService):
+    REPOSITORIES = {
+        'ultmarc_doctor_repository': WholesalerMasterRepository,
+        'prefc_repository': PrefcMasterRepository
+    }
+
+    ultmarc_doctor_repository: WholesalerMasterRepository
+    prefc_repository: PrefcMasterRepository
+
+    def __init__(self, repositories: dict[str, BaseRepository], clients: dict[str, AWSAPIClient]) -> None:
+        super().__init__(repositories, clients)
+        self.ultmarc_doctor_repository = repositories['ultmarc_doctor_repository']
+        self.prefc_repository = repositories['prefc_repository']
+
+    def prepare_ultmarc_doctor_view(
+        self,
+        session: UserSession
+    ) -> UltmarcDoctorViewModel:
+        # # 都道府県リストを取得
+        prefcs = self.prefc_repository.fetch_all()
+
+        ultmarc = UltmarcDoctorViewModel(
+            prefc_models=prefcs
+        )
+        return ultmarc
+
+    def search_bio_data(self, search_params: BioModel):
+        # 生物由来データを検索
+        bio_sales_view_data = self.bio_sales_repository.fetch_many(parameter=search_params)
+        # 画面表示用に加工
+        display_bio_data: list[BisDisplayModel] = [BisDisplayModel(data) for data in bio_sales_view_data]
+
+        return display_bio_data
+
+    def search_download_bio_data(self, search_params: BioModel):
+        # 生物由来データをダウンロードするために、DBから検索した結果をデータフレームに変換
+        bio_sales_data_frame = self.bio_sales_repository.fetch_as_data_frame(parameter=search_params)
+        return bio_sales_data_frame
+
+    def write_excel_file(self, data_frame: pd.DataFrame, user_id: str, timestamp: datetime):
+        # Excelに書き込み
+        output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
+                                     f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.xlsx')
+
+        # テンプレートファイルをコピーして出力ファイルの枠だけを作る
+        shutil.copyfile(
+            src=constants.BIO_EXCEL_TEMPLATE_FILE_PATH,
+            dst=output_file_path
+        )
+        # ExcelWriterの追記モード(`mode`='a')でファイルを開く
+        # `engine``='openpyxlは、追記モードでExcelを開くためのおまじない(xlsxしか動作しないが、こちらが出すものなので問題ナシ)
+        # 既存シートへの書き込みは、`if_sheet_exists='overlay'を指定する
+        with pd.ExcelWriter(output_file_path, engine='openpyxl', mode='a', if_sheet_exists='overlay') as writer:
+            # `sheet_name`引数を省略した場合は、「Sheet1」に書き込む。
+            # DF内のヘッダと連番を書き込みたくない場合、`header`と`index`をFalseに指定する。
+            # `startrow`と`startcol`で、Excelの書き込み位置を決定する。省略した場合はA1セルから書く。
+            data_frame.to_excel(writer, header=False, index=False, startrow=1, startcol=0)
+
+        return output_file_path
+
+    def write_csv_file(self, data_frame: pd.DataFrame, user_id: str, header: list[str], timestamp: datetime):
+        # csvに書き込み
+        output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
+                                     f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.csv')
+        # 横長のDataFrameとするため、ヘッダーの加工処理
+        header_data = {}
+        for df_column, header_column in zip(data_frame.columns, header):
+            header_data[df_column] = header_column
+
+        header_df = pd.DataFrame([header_data], index=None)
+        output_df = pd.concat([header_df, data_frame])
+        # ヘッダー行としてではなく、1レコードとして出力する
+        output_df.to_csv(output_file_path, index=False, header=False)
+
+        return output_file_path
+
+    def upload_bio_data_file(self, local_file_path: str) -> None:
+        bucket_name = environment.BIO_ACCESS_LOG_BUCKET
+        # TODO: フォルダを変える
+        file_key = f'bio/{path.basename(local_file_path)}'
+        self.s3_client.upload_file(local_file_path, bucket_name, file_key)
+
+    def generate_download_file_url(self, local_file_path: str, user_id: str, kind: str) -> str:
+        bucket_name = environment.BIO_ACCESS_LOG_BUCKET
+        # TODO: フォルダを変える
+        file_key = f'bio/{path.basename(local_file_path)}'
+        download_filename = f'{user_id}_生物由来卸販売データ.{kind}'
+        return self.s3_client.generate_presigned_url(bucket_name, file_key, download_filename)
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 214ea399..45189de3 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -11,7 +11,7 @@ require_once('/home/nds_dwh/webroot/common/function/getDateBatchJSString.php');
 <!DOCTYPE html>
 <html lang="ja">
 <head>
-    {% with subtitle = '医師検索一覧' %}
+    {% with subtitle = ultmarc.subtitle %}
     {% include '_header.html' %}
     {% endwith  %}
     <link rel="stylesheet" href="/static/css/ultStyle.css">
@@ -231,6 +231,12 @@ if (!isset($isDBSuccess)) {
 						<select class="text search_dropdown" name="textbox_11" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
 							<!--ToDo 都道府県ドロップダウンの中身を作成(マスタからとってこれる) -->
 							<option value=""></option>
+                            {% for prefc in ultmarc.prefc_models %}
+                            <option 
+                                value="{{prefc['prefc_cd']}}" {{ultmarc.is_selected_prefc_cd(prefc['prefc_cd'])}}>
+                                {{prefc['prefc_name']}}
+                            </option>
+                            {% endfor %}
 							<!-- <?php
 							foreach ($prefc as $value){
 							?>

From 1cb9046402ab628379909dcec46ab97b42205aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 30 May 2023 16:36:59 +0900
Subject: [PATCH 03/24] =?UTF-8?q?=E3=83=90=E3=83=83=E3=83=81=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9?=
 =?UTF-8?q?=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E8=AD=A6=E5=91=8A=E3=83=A1?=
 =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E5=88=B6=E5=BE=A1=E3=82=92=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py                | 7 ++++++-
 .../src/model/view/ultmarc_doctor_view_model.py            | 2 +-
 ecs/jskult-webapp/src/templates/docSearch.html             | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index ed966685..f440332d 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -27,15 +27,20 @@ router.route_class = AuthenticatedRoute
 @router.get('/docSearch')
 def ultmarc_view(
     request: Request,
-    # batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)),
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)),
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
     # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
     # if batch_status_service.is_batch_processing():
     #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
     # # 検索項目の取得
     ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
+    ultmarc.is_batch_processing = is_batch_processing
+
     # セッション書き換え
     session.update(
         actions=[
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 1e3cf236..894573e4 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -14,7 +14,7 @@ from src.system_var import environment
 
 class UltmarcDoctorViewModel(BaseModel):
     subtitle: str = '医師検索一覧'
-    batch_status: Optional[str]
+    is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
     doctor_data: Optional[list[BisDisplayModel]] = []
     form_data: Optional[BioModel]
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 45189de3..26d17b9f 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -162,7 +162,10 @@ if (!isset($isDBSuccess)) {
 						// バッチ処理中判断
 						if(getDateBatchJSString($dbs, $user, $pass) && $isDBSuccess){
 						?> -->
-							<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+                        {% if ultmarc.is_batch_processing %}
+                        <div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+                        {% endif %}
+							
 						<!-- <?php
 						} -->
 						<!-- ?> -->

From 6497a0b86d3f48d234505254f2887caa199f9d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 30 May 2023 17:45:13 +0900
Subject: [PATCH 04/24] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E9=A0=85=E7=9B=AE?=
 =?UTF-8?q?=E3=81=8C=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AB=E6=B8=A1?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   | 33 +++++++-----
 .../src/model/request/ultmarc_doctor.py       | 51 +++++++++++++++++++
 .../src/templates/docSearch.html              | 25 +++++----
 3 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/request/ultmarc_doctor.py

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index f440332d..19d43e5e 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -6,7 +6,7 @@ from starlette import status
 
 from src.depends.services import get_service
 from src.model.internal.session import UserSession
-from src.model.request.bio import BioModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.view.bio_view_model import BioViewModel
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
@@ -25,7 +25,7 @@ router.route_class = AuthenticatedRoute
 
 
 @router.get('/docSearch')
-def ultmarc_view(
+def ultmarc_doctor_view(
     request: Request,
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)),
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
@@ -59,25 +59,30 @@ def ultmarc_view(
     return templates_response
 
 
-@router.post('/BioSearchList')
-def search_bio(
+@router.post('/docSearch')
+def search_doc(
     request: Request,
-    bio_form: Optional[BioModel] = Depends(BioModel.as_form),
-    bio_service: BioViewService = Depends(get_service(BioViewService)),
+    ultmarc_doctor_form: Optional[UltmarcDoctorModel] = Depends(UltmarcDoctorModel.as_form),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     # error_log(date("Y/m/d H:i:s") . " [INFO] UserId:" . $UserId . "\r\n", 3, "$execLog");
     session: UserSession = request.session
     # バッチ処理中の場合、機能を利用させない
-    if batch_status_service.is_batch_processing():
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+    # is_batch_processing = batch_status_service.is_batch_processing()
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
 
     # 生物由来データを検索
-    bio_sales_view_data = bio_service.search_bio_data(bio_form)
+    ultmarc_doctor_data = []
     # 検索項目などのデータを取得
-    bio: BioViewModel = bio_service.prepare_bio_view(session)
-    bio.bio_data = bio_sales_view_data
-    bio.form_data = bio_form
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
+    ultmarc.is_batch_processing = batch_status_service.is_batch_processing()
+    ultmarc.doctor_data = ultmarc_doctor_data
+
+    # bio: BioViewModel = bio_service.prepare_bio_view(session)
+    # bio.bio_data = ultmarc_doctor_data
+    # bio.form_data = bio_form
     # セッション書き換え
     session.update(
         actions=[
@@ -87,9 +92,9 @@ def search_bio(
     )
     session_key = set_session(session)
     templates_response = templates.TemplateResponse(
-        'bioSearchList.html', {
+        'docSearch.html', {
             'request': request,
-            'bio': bio
+            'ultmarc': ultmarc,
         },
         headers={'session_key': session_key}
     )
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
new file mode 100644
index 00000000..5935c076
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -0,0 +1,51 @@
+from typing import Optional
+
+from fastapi import Form
+from pydantic import BaseModel
+
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorModel(BaseModel):
+    dcf_pcf_dr_cd: Optional[str]
+    dr_name: Optional[str]
+    dr_name_kana: Optional[str]
+    dcf_dsf_inst_cd: Optional[str]
+    form_inst_name_kanji: Optional[str]
+    form_inst_name_kana: Optional[str]
+    prefc_cd: Optional[str]
+    blng_sec_name: Optional[str]
+    trt_course_name: Optional[str]
+    alma: Optional[str]
+    grad_y: Optional[str]
+
+    @classmethod
+    def as_form(
+        cls,
+        ctrl_dcf_pcf_dr_cd: str = Form(None),
+        ctrl_dr_name: str = Form(None),
+        ctrl_dr_name_kana: str = Form(None),
+        ctrl_dcf_dsf_inst_cd: str = Form(None),
+        ctrl_form_inst_name_kanji: str = Form(None),
+        ctrl_form_inst_name_kana: str = Form(None),
+        ctrl_prefc_cd: str = Form(None),
+        ctrl_blng_sec_name: str = Form(None),
+        ctrl_trt_course_name: str = Form(None),
+        ctrl_alma: str = Form(None),
+        ctrl_grad_y: str = Form(None)
+    ):
+
+        return cls(
+            dcf_pcf_dr_cd=ctrl_dcf_pcf_dr_cd,
+            dr_name=ctrl_dr_name,
+            dr_name_kana=ctrl_dr_name_kana,
+            dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd,
+            form_inst_name_kanji=ctrl_form_inst_name_kanji,
+            form_inst_name_kana=ctrl_form_inst_name_kana,
+            prefc_cd=ctrl_prefc_cd,
+            blng_sec_name=ctrl_blng_sec_name,
+            trt_course_name=ctrl_trt_course_name,
+            alma=ctrl_alma,
+            grad_y=ctrl_grad_y
+        )
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 26d17b9f..d639d28f 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -180,15 +180,14 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">医師コード:</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_1" value="
-                        " maxlength='10' oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd" value="" maxlength='10' oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION['docTextbox_1'])) {
 							echo $_SESSION['docTextbox_1'];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">氏名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_2" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
 							echo $_SESSION["docTextbox_2"];
 						}  ?> -->
@@ -196,7 +195,7 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.8の修正 氏名(カナ)→氏名(かな・カナ) -->
 					<td class="docSearchColumnTd">氏名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_3" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
 							echo $_SESSION["docTextbox_3"];
 						}  ?> -->
@@ -205,14 +204,14 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">勤務先コード：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_4" value="" maxlength='11' oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" value="" maxlength='11' oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION['docTextbox_4'])) {
 							echo $_SESSION['docTextbox_4'];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">勤務先名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_5" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_5"])) {
 							echo $_SESSION["docTextbox_5"];
 						}  ?> -->
@@ -220,7 +219,7 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.8の修正 勤務先名(カナ)→勤務先名(かな・カナ) -->
 					<td class="docSearchColumnTd">勤務先名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_6" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_6"])) {
 							echo $_SESSION["docTextbox_6"];
 						}  ?> -->
@@ -231,7 +230,7 @@ if (!isset($isDBSuccess)) {
 					<td class="docSearchColumnTd">勤務先都道府県：</td>
 					<td class="search_tb">
 						<!-- 都道府県のドロップダウン -->
-						<select class="text search_dropdown" name="textbox_11" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
+						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
 							<!--ToDo 都道府県ドロップダウンの中身を作成(マスタからとってこれる) -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
@@ -253,14 +252,14 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.2の追加 End -->
 					<td class="docSearchColumnTd">所属部科(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_7" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_7"])) {
 							echo $_SESSION["docTextbox_7"];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">診療科目(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_8" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_8"])) {
 							echo $_SESSION["docTextbox_8"];
 						}  ?> -->
@@ -269,18 +268,18 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">出身大学(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="textbox_9" value="" oninput="formBtDisabled(controlCount)">
+						<input class="text docSearchTextbox" type="text" name="ctrl_alma" value="" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_9"])) {
 							echo $_SESSION["docTextbox_9"];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">卒年：</td>
-					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="textbox_10" value="" maxlength='4' oninput="formBtDisabled(controlCount)"></td>
+					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y" value="" maxlength='4' oninput="formBtDisabled()"></td>
                     <!-- <?php if(isset($_SESSION["docTextbox_10"])) {
                         echo $_SESSION["docTextbox_10"];
                     }  ?> -->
 					<td class="search_btTd" colspan="2">
-						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr(controlCount);">
+						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();">
 						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
 					</td>
 				</tr>

From 45c6af090c7832b14dc6e4475b0bcc7a8f2d4f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Fri, 2 Jun 2023 10:33:16 +0900
Subject: [PATCH 05/24] =?UTF-8?q?SQL=E3=82=A8=E3=83=A9=E3=83=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |   7 +-
 ecs/jskult-webapp/src/db/sql_condition.py     |  13 +-
 .../src/model/db/ultmarc_doctor.py            |  19 +++
 .../model/view/ultmarc_doctor_view_model.py   |  86 ++++++++++---
 .../repositories/ultmarc_doctor_repository.py | 120 ++++++++++++++++++
 .../src/services/ultmarc_view_service.py      | 110 ++++++++--------
 ecs/jskult-webapp/src/templates/_header.html  |   3 +
 .../src/templates/bioSearchList.html          |   5 +-
 .../src/templates/docSearch.html              |  83 +++++-------
 9 files changed, 314 insertions(+), 132 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_doctor.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 19d43e5e..a42d1ccc 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -73,16 +73,19 @@ def search_doc(
     # if batch_status_service.is_batch_processing():
     #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
 
-    # 生物由来データを検索
-    ultmarc_doctor_data = []
+    # 医師データを検索
+    ultmarc_doctor_data = ultmarc_service.search_doctor_data(ultmarc_doctor_form)
+
     # 検索項目などのデータを取得
     ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
     ultmarc.is_batch_processing = batch_status_service.is_batch_processing()
     ultmarc.doctor_data = ultmarc_doctor_data
+    ultmarc.form_data = ultmarc_doctor_form
 
     # bio: BioViewModel = bio_service.prepare_bio_view(session)
     # bio.bio_data = ultmarc_doctor_data
     # bio.form_data = bio_form
+
     # セッション書き換え
     session.update(
         actions=[
diff --git a/ecs/jskult-webapp/src/db/sql_condition.py b/ecs/jskult-webapp/src/db/sql_condition.py
index dfd73858..f0f929a3 100644
--- a/ecs/jskult-webapp/src/db/sql_condition.py
+++ b/ecs/jskult-webapp/src/db/sql_condition.py
@@ -4,7 +4,7 @@ class SQLCondition:
     param: str
     literal: bool
 
-    def __init__(self, column: str, operator: str, param: str, literal=False) -> None:
+    def __init__(self, column: str, operator: str, param: str, literal=False, like_wildcard=False) -> None:
         """
         Args:
             column (str): カラム名
@@ -12,17 +12,22 @@ class SQLCondition:
             param (str): パラメータ(プレースホルダーかリテラル値か)
             literal (bool, optional): リテラル値を埋め込むかどうか。
             画面から渡ってきた値を使うとSQLインジェクションの危険性があるため、固定値で使用すること。
+            like_wildcard (bool, optional): like検索で部分一致検索にするかどうか。
         """
         self.column = column
         self.operator = operator
         self.param = param
-        self.literal=literal
-    
+        self.literal = literal
+        self.like_wildcard = like_wildcard
+
     def apply(self):
         # literalがFalseならプレースホルダー。Trueだったならは固定値。
         param = f':{self.param}' if self.literal is False else self.param
+        # like_wildcardがTrueならLike検索にする
+        param = f'%{param}%' if self.like_wildcard is False else param
         return f' {self.column} {self.operator} {param}'
 
+
 # 定数
 EQ = '='
 NE = '<>'
@@ -32,4 +37,4 @@ GE = '>='
 LE = '<='
 LIKE = 'LIKE'
 IS = 'IS'
-IS_NOT = 'IS NOT'
\ No newline at end of file
+IS_NOT = 'IS NOT'
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py
new file mode 100644
index 00000000..f5576a02
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor.py
@@ -0,0 +1,19 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorDBModel(BaseDBModel):
+    dcf_pcf_dr_cd: Optional[str]
+    dr_name: Optional[str]
+    form_inst_name_kanji: Optional[str]
+    dcf_dsf_inst_cd: Optional[str]
+    blng_sec_name: Optional[str]
+    trt_course_name: Optional[str]
+    form_post_name: Optional[str]
+    alma: Optional[str]
+    grad_y: Optional[str]
+    prefc_name: Optional[str]
+    blng_sec_cd: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 894573e4..02ac88a0 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -6,8 +6,8 @@ from typing import Optional
 from pydantic import BaseModel
 
 from src.model.db.prefc_master import PrefcMasterModel
-from src.model.db.wholesaler_master import WholesalerMasterModel
-from src.model.request.bio import BioModel
+# from src.model.db.doctor_view import DoctorViewModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.view.bio_disp_model import BisDisplayModel
 from src.system_var import environment
 
@@ -16,13 +16,14 @@ class UltmarcDoctorViewModel(BaseModel):
     subtitle: str = '医師検索一覧'
     is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
+    # doctor_models: list[DoctorViewModel]
     doctor_data: Optional[list[BisDisplayModel]] = []
-    form_data: Optional[BioModel]
+    form_data: Optional[UltmarcDoctorModel]
 
     def display_wholesaler_names(self):
         display_names = [
             f'{whs_model.rec_whs_cd}-{whs_model.rec_whs_sub_cd}:{whs_model.nm}'
-            for whs_model in self.whs_models
+            for whs_model in self.doctor_models
         ]
         return display_names
 
@@ -30,13 +31,74 @@ class UltmarcDoctorViewModel(BaseModel):
         def date_handler(obj):
             return obj.isoformat() if hasattr(obj, 'isoformat') else obj
         return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
+# **************************　のま作　**************************
 
-    # def is_selected_whs_name(self, selected_wholesaler):
-    #     if not self.is_form_submitted():
-    #         return ''
+    # 医師コード
+    def is_input_dcf_pcf_dr_cd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.dcf_pcf_dr_cd
 
-    #     form_wholesaler_full_name = f'{self.form_data.wholesaler_code}-{self.form_data.wholesaler_sub_code}:{self.form_data.wholesaler_name}'
-    #     return self._selected_value(form_wholesaler_full_name, selected_wholesaler)
+    # 氏名(漢字)
+    def is_input_dr_name(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.dr_name
+
+    # 氏名(かな・カナ)
+    def is_input_dr_name_kana(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.dr_name_kana
+
+    # 勤務先コード
+    def is_input_dcf_dsf_inst_cd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.dcf_dsf_inst_cd
+
+    # 勤務先名(漢字)
+    def is_input_form_inst_name_kanji(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.form_inst_name_kanji
+
+    # 勤務先名(かな・カナ)
+    def is_input_form_inst_name_kana(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.form_inst_name_kana
+
+    # 勤務先都道府県
+    def is_selected_prefc_cd(self, selected_prefc_cd):
+        if not self.is_form_submitted():
+            return ''
+        return self._selected_value(self.form_data.prefc_cd, selected_prefc_cd)
+
+    # 所属部科(漢字)
+    def is_input_blng_sec_name(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.blng_sec_name
+
+    # 診療科目(漢字)
+    def is_input_trt_course_name(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.trt_course_name
+
+    # 出身大学(漢字)
+    def is_input_alma(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.alma
+
+    # 卒年
+    def is_grad_y(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.grad_y
+# **************************　のま作　**************************
 
     # def is_selected_org_kbn(self, selected_org_kbn):
     #     if not self.is_form_submitted():
@@ -67,12 +129,6 @@ class UltmarcDoctorViewModel(BaseModel):
 
     #     return self._selected_value(self.form_data.data_kbn, selected_data_kbn)
 
-    def is_selected_prefc_cd(self, selected_prefc_cd):
-        if not self.is_form_submitted():
-            return ''
-        return ''
-        # return self._selected_value(self.form_data.maker_cd, selected_prefc_cd)
-
     # def is_input_rev_hsdnymd_srk_from(self):
     #     if not self.is_form_submitted():
     #         return ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
new file mode 100644
index 00000000..5321ba46
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -0,0 +1,120 @@
+from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
+from src.repositories.base_repository import BaseRepository
+from src.db import sql_condition as condition
+from src.db.sql_condition import SQLCondition
+from src.model.request.ultmarc_doctor import UltmarcDoctorModel
+from src.repositories.base_repository import BaseRepository
+from src.util.string_util import is_not_empty
+
+
+class UltmarcDoctorRepository(BaseRepository):
+
+    FETCH_SQL = """\
+    SELECT
+        com_dr.dcf_pcf_dr_cd,
+        com_dr.dr_name,
+        com_inst.form_inst_name_kanji,
+        com_inst.dcf_dsf_inst_cd,
+        com_blng_sec.blng_sec_name,
+        com_trt_course.trt_course_name,
+        com_post.form_post_name,
+        com_alma.alma,
+        com_dr.grad_y,
+        mst_prefc.prefc_name,
+        com_dr_wrkplace.blng_sec_cd
+    FROM
+        src05.com_dr
+    LEFT JOIN src05.mst_prefc ON com_dr.prefc_cd = mst_prefc.prefc_cd
+    LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd
+    LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd
+    LEFT JOIN src05.com_blng_sec ON com_dr_wrkplace.blng_sec_cd = com_blng_sec.blng_sec_cd
+    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
+    LEFT JOIN src05.com_post ON com_dr_wrkplace.post_cd = com_post.post_cd
+    LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
+    WHERE
+        {where_clause}
+    ORDER BY
+        com_dr.dcf_pcf_dr_cd, 
+        com_dr_wrkplace.dcf_dsf_inst_cd, 
+        com_dr_wrkplace.blng_sec_cd,
+        com_dr_trt_course.trt_course_cd
+    \
+    """
+
+    def fetch_many(self, parameter: UltmarcDoctorModel) -> list[UltmarcDoctorDBModel]:
+        try:
+            self._database.connect()
+            where_clause = self.__build_condition(parameter)
+            query = self.FETCH_SQL.format(where_clause=where_clause)
+            result = self._database.execute_select(query, parameter.dict())
+            models = [UltmarcDoctorDBModel(**r) for r in result]
+
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
+
+    def __build_condition(self, parameter: UltmarcDoctorModel):
+        where_clauses: list[SQLCondition] = []
+
+        # 医師コード
+        if is_not_empty(parameter.dcf_pcf_dr_cd):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('com_dr.dcf_pcf_dr_cd', condition.LIKE,
+                                 'dcf_pcf_dr_cd', like_wildcard=True))
+        # 氏名(漢字)
+        if is_not_empty(parameter.dr_name):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('dr_name', condition.LIKE, 'dr_name', like_wildcard=True))
+        # 氏名(かな・カナ)
+        if is_not_empty(parameter.dr_name_kana):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('dr_name_kana', condition.LIKE, 'dr_name_kana', like_wildcard=True))
+        # 勤務先コード
+        if is_not_empty(parameter.dcf_dsf_inst_cd):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('com_inst.dcf_dsf_inst_cd',
+                                 condition.LIKE, 'dcf_dsf_inst_cd', like_wildcard=True))
+        # 勤務先名(漢字)
+        if is_not_empty(parameter.form_inst_name_kanji):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('form_inst_name_kanji', condition.LIKE,
+                                 'form_inst_name_kanji', like_wildcard=True))
+        # 勤務先名(かな・カナ)
+        if is_not_empty(parameter.form_inst_name_kana):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('form_inst_name_kana', condition.LIKE,
+                                 'form_inst_name_kana', like_wildcard=True))
+
+        # 勤務先都道府県
+        if is_not_empty(parameter.prefc_cd):
+            where_clauses.append(SQLCondition('com_inst.prefc_cd', condition.EQ, 'prefc_cd'))
+
+        # 所属部科(漢字)
+        if is_not_empty(parameter.blng_sec_name):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('com_blng_sec.blng_sec_name',
+                                 condition.LIKE, 'blng_sec_name', like_wildcard=True))
+
+        # 診療科目(漢字)
+        if is_not_empty(parameter.trt_course_name):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('trt_course_name', condition.LIKE, 'trt_course_name', like_wildcard=True))
+
+        # 出身大学(漢字)
+        if is_not_empty(parameter.alma):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('alma', condition.LIKE, 'alma', like_wildcard=True))
+
+        # 卒年
+        if is_not_empty(parameter.grad_y):
+            # 必ず部分一致で検索
+            where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y', like_wildcard=True))
+
+        where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
+
+        return where_clauses_str
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 6d296f74..0fd38f18 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -7,12 +7,13 @@ 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.bio import BioModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.view.bio_disp_model import BisDisplayModel
 from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
 from src.repositories.base_repository import BaseRepository
 from src.repositories.bio_sales_view_repository import BioSalesViewRepository
 from src.repositories.prefc_master_repository import PrefcMasterRepository
+from src.repositories.ultmarc_doctor_repository import UltmarcDoctorRepository
 from src.repositories.pharmacy_product_master_repository import \
     PharmacyProductMasterRepository
 from src.repositories.wholesaler_master_repository import \
@@ -23,11 +24,11 @@ from src.system_var import constants, environment
 
 class UltmarcViewService(BaseService):
     REPOSITORIES = {
-        'ultmarc_doctor_repository': WholesalerMasterRepository,
+        'ultmarc_doctor_repository': UltmarcDoctorRepository,
         'prefc_repository': PrefcMasterRepository
     }
 
-    ultmarc_doctor_repository: WholesalerMasterRepository
+    ultmarc_doctor_repository: UltmarcDoctorRepository
     prefc_repository: PrefcMasterRepository
 
     def __init__(self, repositories: dict[str, BaseRepository], clients: dict[str, AWSAPIClient]) -> None:
@@ -47,65 +48,62 @@ class UltmarcViewService(BaseService):
         )
         return ultmarc
 
-    def search_bio_data(self, search_params: BioModel):
-        # 生物由来データを検索
-        bio_sales_view_data = self.bio_sales_repository.fetch_many(parameter=search_params)
-        # 画面表示用に加工
-        display_bio_data: list[BisDisplayModel] = [BisDisplayModel(data) for data in bio_sales_view_data]
+    def search_doctor_data(self, search_params: UltmarcDoctorModel):
+        # 医師データを検索
+        ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
+        return ultmarc_doctor_data
 
-        return display_bio_data
+    # def search_download_bio_data(self, search_params: BioModel):
+    #     # 生物由来データをダウンロードするために、DBから検索した結果をデータフレームに変換
+    #     bio_sales_data_frame = self.bio_sales_repository.fetch_as_data_frame(parameter=search_params)
+    #     return bio_sales_data_frame
 
-    def search_download_bio_data(self, search_params: BioModel):
-        # 生物由来データをダウンロードするために、DBから検索した結果をデータフレームに変換
-        bio_sales_data_frame = self.bio_sales_repository.fetch_as_data_frame(parameter=search_params)
-        return bio_sales_data_frame
+    # def write_excel_file(self, data_frame: pd.DataFrame, user_id: str, timestamp: datetime):
+    #     # Excelに書き込み
+    #     output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
+    #                                  f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.xlsx')
 
-    def write_excel_file(self, data_frame: pd.DataFrame, user_id: str, timestamp: datetime):
-        # Excelに書き込み
-        output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
-                                     f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.xlsx')
+    #     # テンプレートファイルをコピーして出力ファイルの枠だけを作る
+    #     shutil.copyfile(
+    #         src=constants.BIO_EXCEL_TEMPLATE_FILE_PATH,
+    #         dst=output_file_path
+    #     )
+    #     # ExcelWriterの追記モード(`mode`='a')でファイルを開く
+    #     # `engine``='openpyxlは、追記モードでExcelを開くためのおまじない(xlsxしか動作しないが、こちらが出すものなので問題ナシ)
+    #     # 既存シートへの書き込みは、`if_sheet_exists='overlay'を指定する
+    #     with pd.ExcelWriter(output_file_path, engine='openpyxl', mode='a', if_sheet_exists='overlay') as writer:
+    #         # `sheet_name`引数を省略した場合は、「Sheet1」に書き込む。
+    #         # DF内のヘッダと連番を書き込みたくない場合、`header`と`index`をFalseに指定する。
+    #         # `startrow`と`startcol`で、Excelの書き込み位置を決定する。省略した場合はA1セルから書く。
+    #         data_frame.to_excel(writer, header=False, index=False, startrow=1, startcol=0)
 
-        # テンプレートファイルをコピーして出力ファイルの枠だけを作る
-        shutil.copyfile(
-            src=constants.BIO_EXCEL_TEMPLATE_FILE_PATH,
-            dst=output_file_path
-        )
-        # ExcelWriterの追記モード(`mode`='a')でファイルを開く
-        # `engine``='openpyxlは、追記モードでExcelを開くためのおまじない(xlsxしか動作しないが、こちらが出すものなので問題ナシ)
-        # 既存シートへの書き込みは、`if_sheet_exists='overlay'を指定する
-        with pd.ExcelWriter(output_file_path, engine='openpyxl', mode='a', if_sheet_exists='overlay') as writer:
-            # `sheet_name`引数を省略した場合は、「Sheet1」に書き込む。
-            # DF内のヘッダと連番を書き込みたくない場合、`header`と`index`をFalseに指定する。
-            # `startrow`と`startcol`で、Excelの書き込み位置を決定する。省略した場合はA1セルから書く。
-            data_frame.to_excel(writer, header=False, index=False, startrow=1, startcol=0)
+    #     return output_file_path
 
-        return output_file_path
+    # def write_csv_file(self, data_frame: pd.DataFrame, user_id: str, header: list[str], timestamp: datetime):
+    #     # csvに書き込み
+    #     output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
+    #                                  f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.csv')
+    #     # 横長のDataFrameとするため、ヘッダーの加工処理
+    #     header_data = {}
+    #     for df_column, header_column in zip(data_frame.columns, header):
+    #         header_data[df_column] = header_column
 
-    def write_csv_file(self, data_frame: pd.DataFrame, user_id: str, header: list[str], timestamp: datetime):
-        # csvに書き込み
-        output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
-                                     f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.csv')
-        # 横長のDataFrameとするため、ヘッダーの加工処理
-        header_data = {}
-        for df_column, header_column in zip(data_frame.columns, header):
-            header_data[df_column] = header_column
+    #     header_df = pd.DataFrame([header_data], index=None)
+    #     output_df = pd.concat([header_df, data_frame])
+    #     # ヘッダー行としてではなく、1レコードとして出力する
+    #     output_df.to_csv(output_file_path, index=False, header=False)
 
-        header_df = pd.DataFrame([header_data], index=None)
-        output_df = pd.concat([header_df, data_frame])
-        # ヘッダー行としてではなく、1レコードとして出力する
-        output_df.to_csv(output_file_path, index=False, header=False)
+    #     return output_file_path
 
-        return output_file_path
+    # def upload_bio_data_file(self, local_file_path: str) -> None:
+    #     bucket_name = environment.BIO_ACCESS_LOG_BUCKET
+    #     # TODO: フォルダを変える
+    #     file_key = f'bio/{path.basename(local_file_path)}'
+    #     self.s3_client.upload_file(local_file_path, bucket_name, file_key)
 
-    def upload_bio_data_file(self, local_file_path: str) -> None:
-        bucket_name = environment.BIO_ACCESS_LOG_BUCKET
-        # TODO: フォルダを変える
-        file_key = f'bio/{path.basename(local_file_path)}'
-        self.s3_client.upload_file(local_file_path, bucket_name, file_key)
-
-    def generate_download_file_url(self, local_file_path: str, user_id: str, kind: str) -> str:
-        bucket_name = environment.BIO_ACCESS_LOG_BUCKET
-        # TODO: フォルダを変える
-        file_key = f'bio/{path.basename(local_file_path)}'
-        download_filename = f'{user_id}_生物由来卸販売データ.{kind}'
-        return self.s3_client.generate_presigned_url(bucket_name, file_key, download_filename)
+    # def generate_download_file_url(self, local_file_path: str, user_id: str, kind: str) -> str:
+    #     bucket_name = environment.BIO_ACCESS_LOG_BUCKET
+    #     # TODO: フォルダを変える
+    #     file_key = f'bio/{path.basename(local_file_path)}'
+    #     download_filename = f'{user_id}_生物由来卸販売データ.{kind}'
+    #     return self.s3_client.generate_presigned_url(bucket_name, file_key, download_filename)
diff --git a/ecs/jskult-webapp/src/templates/_header.html b/ecs/jskult-webapp/src/templates/_header.html
index ae41e99c..01a1521a 100644
--- a/ecs/jskult-webapp/src/templates/_header.html
+++ b/ecs/jskult-webapp/src/templates/_header.html
@@ -6,9 +6,12 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css" integrity="sha384-b6lVK+yci+bfDmaY1u0zE8YYJt0TZxLEAFyYSLHId4xoVvsrQu3INevFKo+Xir8e" crossorigin="anonymous">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+<link rel="stylesheet" href="/static/css/pagenation.css">
+<link rel="stylesheet" href="/static/css/datepicker.css">
 <script src="https://code.jquery.com/jquery-3.6.3.min.js" integrity="sha256-pvPw+upLPUjgMXY0G+8O0xUf+/Im1MZjXxxgOcBQBXU=" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
 <script src="https://pagination.js.org/dist/2.5.0/pagination.min.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/flatpickr/dist/l10n/ja.min.js"></script>
 <script src="/static/function/businessLogicScript.js"></script>
+<script src="/static/lib/fixed_midashi.js"></script>
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index cc208efd..d44247c1 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -5,10 +5,7 @@
     {% include '_header.html' %}
     {% endwith  %}
     <link rel="stylesheet" href="/static/css/bioStyle.css">
-    <link rel="stylesheet" href="/static/css/pagenation.css">
-    <link rel="stylesheet" href="/static/css/datepicker.css">
-    <script src="/static/lib/fixed_midashi.js"></script>
-
+    
     <script type="text/javascript">
         window.onload = function() {
             // 見出し固定初期化
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index d639d28f..dc187eb4 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -15,9 +15,6 @@ require_once('/home/nds_dwh/webroot/common/function/getDateBatchJSString.php');
     {% include '_header.html' %}
     {% endwith  %}
     <link rel="stylesheet" href="/static/css/ultStyle.css">
-    <link rel="stylesheet" href="/static/css/pagenation.css">
-    <link rel="stylesheet" href="/static/css/datepicker.css">
-    <script src="/static/lib/fixed_midashi.js"></script>
 
 	<!-- <link rel="stylesheet" type="text/css" href="<?php echo $ultCss ?>"> -->
 	<!-- <script type="text/javascript" src="<?php echo $ultJsPath ?>"></script> -->
@@ -180,14 +177,16 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">医師コード:</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd" value="" maxlength='10' oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd" 
+						value="{{ultmarc.is_input_dcf_pcf_dr_cd()}}" maxlength='10' oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION['docTextbox_1'])) {
 							echo $_SESSION['docTextbox_1'];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">氏名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name" 
+						value="{{ultmarc.is_input_dr_name()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
 							echo $_SESSION["docTextbox_2"];
 						}  ?> -->
@@ -195,7 +194,8 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.8の修正 氏名(カナ)→氏名(かな・カナ) -->
 					<td class="docSearchColumnTd">氏名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana" 
+						value="{{ultmarc.is_input_dr_name_kana()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
 							echo $_SESSION["docTextbox_3"];
 						}  ?> -->
@@ -204,14 +204,16 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">勤務先コード：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" value="" maxlength='11' oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
+						value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" maxlength='11' oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION['docTextbox_4'])) {
 							echo $_SESSION['docTextbox_4'];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">勤務先名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji" 
+						value="{{ultmarc.is_input_form_inst_name_kanji()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_5"])) {
 							echo $_SESSION["docTextbox_5"];
 						}  ?> -->
@@ -219,7 +221,8 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.8の修正 勤務先名(カナ)→勤務先名(かな・カナ) -->
 					<td class="docSearchColumnTd">勤務先名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana" 
+						value="{{ultmarc.is_input_form_inst_name_kana()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_6"])) {
 							echo $_SESSION["docTextbox_6"];
 						}  ?> -->
@@ -252,14 +255,16 @@ if (!isset($isDBSuccess)) {
 					<!-- アルトマーク課題管理表No.2の追加 End -->
 					<td class="docSearchColumnTd">所属部科(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name" 
+						value="{{ultmarc.is_input_blng_sec_name()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_7"])) {
 							echo $_SESSION["docTextbox_7"];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">診療科目(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name" 
+						value="{{ultmarc.is_input_trt_course_name()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_8"])) {
 							echo $_SESSION["docTextbox_8"];
 						}  ?> -->
@@ -268,13 +273,15 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docSearchColumnTd">出身大学(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_alma" value="" oninput="formBtDisabled()">
+						<input class="text docSearchTextbox" type="text" name="ctrl_alma" 
+						value="{{ultmarc.is_input_alma()}}" oninput="formBtDisabled()">
                         <!-- <?php if(isset($_SESSION["docTextbox_9"])) {
 							echo $_SESSION["docTextbox_9"];
 						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">卒年：</td>
-					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y" value="" maxlength='4' oninput="formBtDisabled()"></td>
+					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y" 
+						value="" maxlength='4' oninput="formBtDisabled()"></td>
                     <!-- <?php if(isset($_SESSION["docTextbox_10"])) {
                         echo $_SESSION["docTextbox_10"];
                     }  ?> -->
@@ -672,7 +679,7 @@ if (!isset($isDBSuccess)) {
         $(function() {
             // スピナー出さない場合は以下、エスケープせず埋め込む
             // {% autoescape False%}
-            let searchResultString = '{}'
+            let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
             // {% endautoescape%}
             const searchResultData = JSON.parse(searchResultString)
             if (searchResultData.length == 0) {
@@ -699,43 +706,17 @@ if (!isset($isDBSuccess)) {
         
         function pagination_content(datas) {
             const display_keys = [
-                'slip_org_kbn',
-                'slip_mgt_no',
-                'rec_ymd',
-                'rec_whs_cd',
-                'rec_whs_sub_cd',
-                'whs_nm',
-                'rec_whs_org_cd',
-                'rec_urag_no',
-                'rev_hsdnymd_srk',
-                'rec_tran_kbn',
-                'tran_kbn_nm',
-                'mkr_cd',
-                'rec_comm_cd',
-                'comm_nm',
-                'whs_rep_comm_nm',
-                'nnsk_cd',
-                'rec_nnskfcl_nm',
-                'whs_rep_nnskfcl_nm',
-                'rec_nnsk_fcl_addr',
-                'whs_rep_nnsk_fcl_addr',
-                'rec_lot_num',
-                'amt_fugo',
-                'expr_dt',
-                'data_kbn',
-                'lot_no_err_flg',
-                'bef_slip_mgt_no',
-                'ins_usr',
-                'ins_dt',
-                'inst_cd',
-                'inst_name_form',
-                'address',
-                'tel_no',
-                'v_whs_cd',
-                'v_whsorg_cd',
-                'whs_org_nm',
-                'v_tran_cd',
-                'iko_flg',
+				'dcf_pcf_dr_cd',
+				'dr_name',
+				'form_inst_name_kanji',
+				'dcf_dsf_inst_cd',
+				'blng_sec_name',
+				'trt_course_name',
+				'form_post_name',
+				'alma',
+				'grad_y',
+				'prefc_name',
+				'blng_sec_cd'
             ];
             const tableRow = document.createElement('tr')
             return datas.map(function (data) {

From 79d241aa18cf304c135a56042ebf8f862b3378fb Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 2 Jun 2023 11:45:50 +0900
Subject: [PATCH 06/24] =?UTF-8?q?feat:=20=E5=8C=BB=E5=B8=AB=E3=81=AE?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=80=E8=87=B4=E6=A4=9C=E7=B4=A2=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/db/sql_condition.py     |  6 +--
 .../repositories/ultmarc_doctor_repository.py | 44 ++++++++++++-------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/ecs/jskult-webapp/src/db/sql_condition.py b/ecs/jskult-webapp/src/db/sql_condition.py
index f0f929a3..d0d645c7 100644
--- a/ecs/jskult-webapp/src/db/sql_condition.py
+++ b/ecs/jskult-webapp/src/db/sql_condition.py
@@ -4,7 +4,7 @@ class SQLCondition:
     param: str
     literal: bool
 
-    def __init__(self, column: str, operator: str, param: str, literal=False, like_wildcard=False) -> None:
+    def __init__(self, column: str, operator: str, param: str, literal=False) -> None:
         """
         Args:
             column (str): カラム名
@@ -12,19 +12,15 @@ class SQLCondition:
             param (str): パラメータ(プレースホルダーかリテラル値か)
             literal (bool, optional): リテラル値を埋め込むかどうか。
             画面から渡ってきた値を使うとSQLインジェクションの危険性があるため、固定値で使用すること。
-            like_wildcard (bool, optional): like検索で部分一致検索にするかどうか。
         """
         self.column = column
         self.operator = operator
         self.param = param
         self.literal = literal
-        self.like_wildcard = like_wildcard
 
     def apply(self):
         # literalがFalseならプレースホルダー。Trueだったならは固定値。
         param = f':{self.param}' if self.literal is False else self.param
-        # like_wildcardがTrueならLike検索にする
-        param = f'%{param}%' if self.like_wildcard is False else param
         return f' {self.column} {self.operator} {param}'
 
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 5321ba46..f9651d98 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -1,7 +1,6 @@
-from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
-from src.repositories.base_repository import BaseRepository
 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.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
@@ -35,8 +34,8 @@ class UltmarcDoctorRepository(BaseRepository):
     WHERE
         {where_clause}
     ORDER BY
-        com_dr.dcf_pcf_dr_cd, 
-        com_dr_wrkplace.dcf_dsf_inst_cd, 
+        com_dr.dcf_pcf_dr_cd,
+        com_dr_wrkplace.dcf_dsf_inst_cd,
         com_dr_wrkplace.blng_sec_cd,
         com_dr_trt_course.trt_course_cd
     \
@@ -45,9 +44,11 @@ class UltmarcDoctorRepository(BaseRepository):
     def fetch_many(self, parameter: UltmarcDoctorModel) -> list[UltmarcDoctorDBModel]:
         try:
             self._database.connect()
-            where_clause = self.__build_condition(parameter)
+            # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
+            clone_parameter = UltmarcDoctorModel(**parameter.dict())
+            where_clause = self.__build_condition(clone_parameter)
             query = self.FETCH_SQL.format(where_clause=where_clause)
-            result = self._database.execute_select(query, parameter.dict())
+            result = self._database.execute_select(query, clone_parameter.dict())
             models = [UltmarcDoctorDBModel(**r) for r in result]
 
             return models
@@ -64,31 +65,36 @@ class UltmarcDoctorRepository(BaseRepository):
         # 医師コード
         if is_not_empty(parameter.dcf_pcf_dr_cd):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('com_dr.dcf_pcf_dr_cd', condition.LIKE,
-                                 'dcf_pcf_dr_cd', like_wildcard=True))
+            parameter.dcf_pcf_dr_cd = f'%{parameter.dcf_pcf_dr_cd}%'
+            where_clauses.append(SQLCondition('com_dr.dcf_pcf_dr_cd', condition.LIKE, 'dcf_pcf_dr_cd'))
         # 氏名(漢字)
         if is_not_empty(parameter.dr_name):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('dr_name', condition.LIKE, 'dr_name', like_wildcard=True))
+            parameter.dr_name = f'%{parameter.dr_name}%'
+            where_clauses.append(SQLCondition('dr_name', condition.LIKE, 'dr_name'))
         # 氏名(かな・カナ)
         if is_not_empty(parameter.dr_name_kana):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('dr_name_kana', condition.LIKE, 'dr_name_kana', like_wildcard=True))
+            parameter.dr_name_kana = f'%{parameter.dr_name_kana}%'
+            where_clauses.append(SQLCondition('dr_name_kana', condition.LIKE, 'dr_name_kana'))
         # 勤務先コード
         if is_not_empty(parameter.dcf_dsf_inst_cd):
             # 必ず部分一致で検索
+            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', like_wildcard=True))
+                                 condition.LIKE, 'dcf_dsf_inst_cd'))
         # 勤務先名(漢字)
         if is_not_empty(parameter.form_inst_name_kanji):
             # 必ず部分一致で検索
+            parameter.form_inst_name_kanji = f'%{parameter.form_inst_name_kanji}%'
             where_clauses.append(SQLCondition('form_inst_name_kanji', condition.LIKE,
-                                 'form_inst_name_kanji', like_wildcard=True))
+                                 'form_inst_name_kanji'))
         # 勤務先名(かな・カナ)
         if is_not_empty(parameter.form_inst_name_kana):
             # 必ず部分一致で検索
+            parameter.form_inst_name_kana = f'%{parameter.form_inst_name_kana}%'
             where_clauses.append(SQLCondition('form_inst_name_kana', condition.LIKE,
-                                 'form_inst_name_kana', like_wildcard=True))
+                                 'form_inst_name_kana'))
 
         # 勤務先都道府県
         if is_not_empty(parameter.prefc_cd):
@@ -97,23 +103,27 @@ class UltmarcDoctorRepository(BaseRepository):
         # 所属部科(漢字)
         if is_not_empty(parameter.blng_sec_name):
             # 必ず部分一致で検索
+            parameter.blng_sec_name = f'%{parameter.blng_sec_name}%'
             where_clauses.append(SQLCondition('com_blng_sec.blng_sec_name',
-                                 condition.LIKE, 'blng_sec_name', like_wildcard=True))
+                                 condition.LIKE, 'blng_sec_name'))
 
         # 診療科目(漢字)
         if is_not_empty(parameter.trt_course_name):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('trt_course_name', condition.LIKE, 'trt_course_name', like_wildcard=True))
+            parameter.trt_course_name = f'%{parameter.trt_course_name}%'
+            where_clauses.append(SQLCondition('trt_course_name', condition.LIKE, 'trt_course_name'))
 
         # 出身大学(漢字)
         if is_not_empty(parameter.alma):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('alma', condition.LIKE, 'alma', like_wildcard=True))
+            parameter.alma = f'%{parameter.alma}%'
+            where_clauses.append(SQLCondition('alma', condition.LIKE, 'alma'))
 
         # 卒年
         if is_not_empty(parameter.grad_y):
             # 必ず部分一致で検索
-            where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y', like_wildcard=True))
+            parameter.grad_y = f'%{parameter.grad_y}%'
+            where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y'))
 
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 

From 90944307ae85e361e85888bcab245c39fb16bea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Fri, 2 Jun 2023 16:27:12 +0900
Subject: [PATCH 07/24] =?UTF-8?q?=E5=8C=BB=E5=B8=AB=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=EF=BC=BF=E6=A4=9C=E7=B4=A2=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=AF=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |   5 -
 .../model/view/ultmarc_doctor_view_model.py   |  80 +--
 .../repositories/ultmarc_doctor_repository.py |  16 +-
 .../src/services/ultmarc_view_service.py      |  61 --
 ecs/jskult-webapp/src/static/css/ultStyle.css |  38 +-
 .../src/templates/docSearch.html              | 574 +-----------------
 6 files changed, 65 insertions(+), 709 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index a42d1ccc..133f6c64 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -66,7 +66,6 @@ def search_doc(
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
-    # error_log(date("Y/m/d H:i:s") . " [INFO] UserId:" . $UserId . "\r\n", 3, "$execLog");
     session: UserSession = request.session
     # バッチ処理中の場合、機能を利用させない
     # is_batch_processing = batch_status_service.is_batch_processing()
@@ -82,10 +81,6 @@ def search_doc(
     ultmarc.doctor_data = ultmarc_doctor_data
     ultmarc.form_data = ultmarc_doctor_form
 
-    # bio: BioViewModel = bio_service.prepare_bio_view(session)
-    # bio.bio_data = ultmarc_doctor_data
-    # bio.form_data = bio_form
-
     # セッション書き換え
     session.update(
         actions=[
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 02ac88a0..ea2afe48 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -6,7 +6,6 @@ from typing import Optional
 from pydantic import BaseModel
 
 from src.model.db.prefc_master import PrefcMasterModel
-# from src.model.db.doctor_view import DoctorViewModel
 from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.view.bio_disp_model import BisDisplayModel
 from src.system_var import environment
@@ -16,58 +15,49 @@ class UltmarcDoctorViewModel(BaseModel):
     subtitle: str = '医師検索一覧'
     is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
-    # doctor_models: list[DoctorViewModel]
     doctor_data: Optional[list[BisDisplayModel]] = []
     form_data: Optional[UltmarcDoctorModel]
 
-    def display_wholesaler_names(self):
-        display_names = [
-            f'{whs_model.rec_whs_cd}-{whs_model.rec_whs_sub_cd}:{whs_model.nm}'
-            for whs_model in self.doctor_models
-        ]
-        return display_names
-
     def ultmarc_data_json_str(self):
         def date_handler(obj):
             return obj.isoformat() if hasattr(obj, 'isoformat') else obj
         return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
-# **************************　のま作　**************************
 
     # 医師コード
     def is_input_dcf_pcf_dr_cd(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.dcf_pcf_dr_cd
+        return self.form_data.dcf_pcf_dr_cd or ''
 
     # 氏名(漢字)
     def is_input_dr_name(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.dr_name
+        return self.form_data.dr_name or ''
 
     # 氏名(かな・カナ)
     def is_input_dr_name_kana(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.dr_name_kana
+        return self.form_data.dr_name_kana or ''
 
     # 勤務先コード
     def is_input_dcf_dsf_inst_cd(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.dcf_dsf_inst_cd
+        return self.form_data.dcf_dsf_inst_cd or ''
 
     # 勤務先名(漢字)
     def is_input_form_inst_name_kanji(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.form_inst_name_kanji
+        return self.form_data.form_inst_name_kanji or ''
 
     # 勤務先名(かな・カナ)
     def is_input_form_inst_name_kana(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.form_inst_name_kana
+        return self.form_data.form_inst_name_kana or ''
 
     # 勤務先都道府県
     def is_selected_prefc_cd(self, selected_prefc_cd):
@@ -79,73 +69,25 @@ class UltmarcDoctorViewModel(BaseModel):
     def is_input_blng_sec_name(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.blng_sec_name
+        return self.form_data.blng_sec_name or ''
 
     # 診療科目(漢字)
     def is_input_trt_course_name(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.trt_course_name
+        return self.form_data.trt_course_name or ''
 
     # 出身大学(漢字)
     def is_input_alma(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.alma
+        return self.form_data.alma or ''
 
     # 卒年
-    def is_grad_y(self):
+    def is_input_grad_y(self):
         if not self.is_form_submitted():
             return ''
-        return self.form_data.grad_y
-# **************************　のま作　**************************
-
-    # def is_selected_org_kbn(self, selected_org_kbn):
-    #     if not self.is_form_submitted():
-    #         return ''
-    #     return self._selected_value(self.form_data.org_kbn, selected_org_kbn)
-
-    # def is_input_rec_ymd_from(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self._format_date_string(self.form_data.rec_ymd_from)
-
-    # def is_input_rec_ymd_to(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self._format_date_string(self.form_data.rec_ymd_to)
-
-    # def is_input_lot_num(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self.form_data.rec_lot_num or ''
-
-    # def is_selected_data_kbn(self, selected_data_kbn):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self._selected_value(self.form_data.data_kbn, selected_data_kbn)
-
-    # def is_input_rev_hsdnymd_srk_from(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self._format_date_string(self.form_data.rev_hsdnymd_srk_from)
-
-    # def is_input_rev_hsdnymd_srk_to(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return self._format_date_string(self.form_data.rev_hsdnymd_srk_to)
-
-    # def is_checked_iko_flg(self):
-    #     if not self.is_form_submitted():
-    #         return ''
-
-    #     return 'checked' if self.form_data.ikoFlg else ''
+        return self.form_data.grad_y or ''
 
     def disabled_button(self):
         return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index f9651d98..f9293893 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -81,20 +81,20 @@ class UltmarcDoctorRepository(BaseRepository):
         if is_not_empty(parameter.dcf_dsf_inst_cd):
             # 必ず部分一致で検索
             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'))
+            where_clauses.append(SQLCondition(
+                'com_inst.dcf_dsf_inst_cd',   condition.LIKE, 'dcf_dsf_inst_cd'))
         # 勤務先名(漢字)
         if is_not_empty(parameter.form_inst_name_kanji):
             # 必ず部分一致で検索
             parameter.form_inst_name_kanji = f'%{parameter.form_inst_name_kanji}%'
-            where_clauses.append(SQLCondition('form_inst_name_kanji', condition.LIKE,
-                                 'form_inst_name_kanji'))
+            where_clauses.append(SQLCondition(
+                'form_inst_name_kanji', condition.LIKE, 'form_inst_name_kanji'))
         # 勤務先名(かな・カナ)
         if is_not_empty(parameter.form_inst_name_kana):
             # 必ず部分一致で検索
             parameter.form_inst_name_kana = f'%{parameter.form_inst_name_kana}%'
-            where_clauses.append(SQLCondition('form_inst_name_kana', condition.LIKE,
-                                 'form_inst_name_kana'))
+            where_clauses.append(SQLCondition(
+                'form_inst_name_kana', condition.LIKE, 'form_inst_name_kana'))
 
         # 勤務先都道府県
         if is_not_empty(parameter.prefc_cd):
@@ -104,8 +104,8 @@ class UltmarcDoctorRepository(BaseRepository):
         if is_not_empty(parameter.blng_sec_name):
             # 必ず部分一致で検索
             parameter.blng_sec_name = f'%{parameter.blng_sec_name}%'
-            where_clauses.append(SQLCondition('com_blng_sec.blng_sec_name',
-                                 condition.LIKE, 'blng_sec_name'))
+            where_clauses.append(SQLCondition(
+                'com_blng_sec.blng_sec_name', condition.LIKE, 'blng_sec_name'))
 
         # 診療科目(漢字)
         if is_not_empty(parameter.trt_course_name):
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 0fd38f18..140863e7 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -8,16 +8,10 @@ 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.view.bio_disp_model import BisDisplayModel
 from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
 from src.repositories.base_repository import BaseRepository
-from src.repositories.bio_sales_view_repository import BioSalesViewRepository
 from src.repositories.prefc_master_repository import PrefcMasterRepository
 from src.repositories.ultmarc_doctor_repository import UltmarcDoctorRepository
-from src.repositories.pharmacy_product_master_repository import \
-    PharmacyProductMasterRepository
-from src.repositories.wholesaler_master_repository import \
-    WholesalerMasterRepository
 from src.services.base_service import BaseService
 from src.system_var import constants, environment
 
@@ -52,58 +46,3 @@ class UltmarcViewService(BaseService):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
         return ultmarc_doctor_data
-
-    # def search_download_bio_data(self, search_params: BioModel):
-    #     # 生物由来データをダウンロードするために、DBから検索した結果をデータフレームに変換
-    #     bio_sales_data_frame = self.bio_sales_repository.fetch_as_data_frame(parameter=search_params)
-    #     return bio_sales_data_frame
-
-    # def write_excel_file(self, data_frame: pd.DataFrame, user_id: str, timestamp: datetime):
-    #     # Excelに書き込み
-    #     output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
-    #                                  f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.xlsx')
-
-    #     # テンプレートファイルをコピーして出力ファイルの枠だけを作る
-    #     shutil.copyfile(
-    #         src=constants.BIO_EXCEL_TEMPLATE_FILE_PATH,
-    #         dst=output_file_path
-    #     )
-    #     # ExcelWriterの追記モード(`mode`='a')でファイルを開く
-    #     # `engine``='openpyxlは、追記モードでExcelを開くためのおまじない(xlsxしか動作しないが、こちらが出すものなので問題ナシ)
-    #     # 既存シートへの書き込みは、`if_sheet_exists='overlay'を指定する
-    #     with pd.ExcelWriter(output_file_path, engine='openpyxl', mode='a', if_sheet_exists='overlay') as writer:
-    #         # `sheet_name`引数を省略した場合は、「Sheet1」に書き込む。
-    #         # DF内のヘッダと連番を書き込みたくない場合、`header`と`index`をFalseに指定する。
-    #         # `startrow`と`startcol`で、Excelの書き込み位置を決定する。省略した場合はA1セルから書く。
-    #         data_frame.to_excel(writer, header=False, index=False, startrow=1, startcol=0)
-
-    #     return output_file_path
-
-    # def write_csv_file(self, data_frame: pd.DataFrame, user_id: str, header: list[str], timestamp: datetime):
-    #     # csvに書き込み
-    #     output_file_path = path.join(constants.BIO_TEMPORARY_FILE_DIR_PATH,
-    #                                  f'Result_{user_id}_{timestamp:%Y%m%d%H%M%S%f}.csv')
-    #     # 横長のDataFrameとするため、ヘッダーの加工処理
-    #     header_data = {}
-    #     for df_column, header_column in zip(data_frame.columns, header):
-    #         header_data[df_column] = header_column
-
-    #     header_df = pd.DataFrame([header_data], index=None)
-    #     output_df = pd.concat([header_df, data_frame])
-    #     # ヘッダー行としてではなく、1レコードとして出力する
-    #     output_df.to_csv(output_file_path, index=False, header=False)
-
-    #     return output_file_path
-
-    # def upload_bio_data_file(self, local_file_path: str) -> None:
-    #     bucket_name = environment.BIO_ACCESS_LOG_BUCKET
-    #     # TODO: フォルダを変える
-    #     file_key = f'bio/{path.basename(local_file_path)}'
-    #     self.s3_client.upload_file(local_file_path, bucket_name, file_key)
-
-    # def generate_download_file_url(self, local_file_path: str, user_id: str, kind: str) -> str:
-    #     bucket_name = environment.BIO_ACCESS_LOG_BUCKET
-    #     # TODO: フォルダを変える
-    #     file_key = f'bio/{path.basename(local_file_path)}'
-    #     download_filename = f'{user_id}_生物由来卸販売データ.{kind}'
-    #     return self.s3_client.generate_presigned_url(bucket_name, file_key, download_filename)
diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css
index 936cef77..3f1850d0 100644
--- a/ecs/jskult-webapp/src/static/css/ultStyle.css
+++ b/ecs/jskult-webapp/src/static/css/ultStyle.css
@@ -46,18 +46,18 @@ table{
 }
 
 .scroll_table::-webkit-scrollbar {
-  height: 5px;
-  width: 10px;
+	height: 5px;
+	width: 10px;
 }
 
 .scroll_table::-webkit-scrollbar-track {
-  border-radius: 5px;
-  background: #eee;
+	border-radius: 5px;
+	background: #eee;
 }
 
 .scroll_table::-webkit-scrollbar-thumb {
-  border-radius: 5px;
-  background: #666;
+	border-radius: 5px;
+	background: #666;
 }
 
 .ult_bt {
@@ -361,7 +361,7 @@ table{
 }
 
 .docHeader_bt{
-	width: 40%;s
+	width: 40%;
 }
 
 /* アルトマーク課題管理表No.2の修正 8% → 10% */
@@ -405,18 +405,18 @@ table{
 }
 
 .docSearchScroll::-webkit-scrollbar {
-  height: 5px;
-  width: 10px;
+	height: 5px;
+	width: 10px;
 }
 
 .docSearchScroll::-webkit-scrollbar-track {
-  border-radius: 5px;
-  background: #eee;
+	border-radius: 5px;
+	background: #eee;
 }
 
 .docSearchScroll::-webkit-scrollbar-thumb {
-  border-radius: 5px;
-  background: #666;
+	border-radius: 5px;
+	background: #666;
 }
 
 .allOnOffButton{
@@ -471,18 +471,18 @@ table{
 }
 
 .scroll::-webkit-scrollbar {
-  height: 5px;
-  width: 10px;
+	height: 5px;
+	width: 10px;
 }
 
 .scroll::-webkit-scrollbar-track {
-  border-radius: 5px;
-  background: #eee;
+	border-radius: 5px;
+	background: #eee;
 }
 
 .scroll::-webkit-scrollbar-thumb {
-  border-radius: 5px;
-  background: #666;
+	border-radius: 5px;
+	background: #666;
 }
 
 .rightBoderLine{
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index dc187eb4..475578fa 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -1,13 +1,3 @@
-<?php
-require_once('/home/nds_dwh/webroot/common/config/ultIniSet.inc');
-require_once('/home/nds_dwh/webroot/common/function/sessionCheck.php');
-require_once('/home/nds_dwh/webroot/common/function/timeout.php');
-require_once('/home/nds_dwh/webroot/common/function/dbcls.php');
-require_once('/home/nds_dwh/webroot/common/config/path.inc');
-require_once('/home/nds_dwh/webroot/common/config/message.inc');
-require_once('/home/nds_dwh/webroot/common/function/getDateBatchJSString.php');
-?>
-
 <!DOCTYPE html>
 <html lang="ja">
 <head>
@@ -16,137 +6,17 @@ require_once('/home/nds_dwh/webroot/common/function/getDateBatchJSString.php');
     {% endwith  %}
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
-	<!-- <link rel="stylesheet" type="text/css" href="<?php echo $ultCss ?>"> -->
-	<!-- <script type="text/javascript" src="<?php echo $ultJsPath ?>"></script> -->
 	<script type="text/javascript">
 		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
 
-		// function DisplayErrorDialog(strMesssage) {
-		// 	$( "#errorTxt" ).html( strMesssage );
-		// 	$("#error").dialog("open");
-		// }
-
-		// function CreateDialog() {
-		// 	$("#error").dialog({
-		// 	  autoOpen: false,
-		// 	  width: 400,
-		// 	  modal: true,
-		// 	  open: function (event, ui) {
-		// 	      $(".ui-dialog-titlebar-close").click(function(){
-		// 	      	$("#error").dialog("close");
-		// 	      	location.href = '<?php echo $logoutPath ?>';
-		// 		  });
-		// 	  },
-		// 	  buttons: [
-		// 	    {
-		// 	      text: 'OK',
-		// 	      click: function(){
-		// 	      	$("#error").dialog("close");
-		// 	      	location.href = '<?php echo $logoutPath ?>';
-		// 	      }
-		// 	    }
-		// 	  ]
-		// 	});
-		// }
-
-		// function imgLoad(){
-		// 	$(".ConfirmImg").attr("src","/common/css/image/kakunin.png");
-		// 	$(".ErrorImg").attr("src","/common/css/image/error.png");
-		// }
-
 		window.onload = function(){
             // 見出し固定初期化
             FixedMidashi.create();
             // ボタン、テキストボックス初期化
             formBtDisabled();
-
-			// メッセージダイアログ初期化
-			// CreateDialog();
-			// imgLoad();
 		}
 	</script>
 </head>
-<!-- <?php
-
-// 施設検索情報の削除 -->
-<!-- $_SESSION['instDelFlg'] = true;
-
-
-if (isset($_POST['docBackBt'])|| isset($_POST['currentPageNum'])) {
-	// 前回の検索結果をそのまま表示
-}
-else if (isset($_POST['search_bt'])) {
-	$_SESSION['docTextbox_1'] = htmlspecialchars($_POST['textbox_1'], ENT_QUOTES);
-	$_SESSION['docTextbox_2'] = htmlspecialchars($_POST['textbox_2'], ENT_QUOTES);
-	$_SESSION['docTextbox_3'] = htmlspecialchars($_POST['textbox_3'], ENT_QUOTES);
-	$_SESSION['docTextbox_4'] = htmlspecialchars($_POST['textbox_4'], ENT_QUOTES);
-	$_SESSION['docTextbox_5'] = htmlspecialchars($_POST['textbox_5'], ENT_QUOTES);
-	$_SESSION['docTextbox_6'] = htmlspecialchars($_POST['textbox_6'], ENT_QUOTES);
-	$_SESSION['docTextbox_7'] = htmlspecialchars($_POST['textbox_7'], ENT_QUOTES);
-	$_SESSION['docTextbox_8'] = htmlspecialchars($_POST['textbox_8'], ENT_QUOTES);
-	$_SESSION['docTextbox_9'] = htmlspecialchars($_POST['textbox_9'], ENT_QUOTES);
-	$_SESSION['docTextbox_10'] = htmlspecialchars($_POST['textbox_10'], ENT_QUOTES);
-	$_SESSION['docTextbox_11'] = htmlspecialchars($_POST['textbox_11'], ENT_QUOTES);
-
-} else if(isset($_POST['docSearchBt'])){
-	$_SESSION['docTextbox_1'] = null;
-	$_SESSION['docTextbox_2'] = null;
-	$_SESSION['docTextbox_3'] = null;
-	$_SESSION['docTextbox_4'] = $_POST['id'];
-	$_SESSION['docTextbox_5'] = null;
-	$_SESSION['docTextbox_6'] = null;
-	$_SESSION['docTextbox_7'] = null;
-	$_SESSION['docTextbox_8'] = null;
-	$_SESSION['docTextbox_9'] = null;
-	$_SESSION['docTextbox_10'] = null;
-	$_SESSION['docTextbox_11'] = null;
-
-} else{
-	$_SESSION['docTextbox_1'] = null;
-	$_SESSION['docTextbox_2'] = null;
-	$_SESSION['docTextbox_3'] = null;
-	$_SESSION['docTextbox_4'] = null;
-	$_SESSION['docTextbox_5'] = null;
-	$_SESSION['docTextbox_6'] = null;
-	$_SESSION['docTextbox_7'] = null;
-	$_SESSION['docTextbox_8'] = null;
-	$_SESSION['docTextbox_9'] = null;
-	$_SESSION['docTextbox_10'] = null;
-	$_SESSION['docTextbox_11'] = null;
-} -->
-
-
-<!-- // どのページを表示させるか -->
-<!-- if (isset($_POST['currentPageNum'])) {
-	$_SESSION['pageNumber'] = $_POST['currentPageNum'];
-} elseif (isset($_POST['instSearchBt']) || isset($_POST['docBackBt'])) {
-	// なにもしない
-} else {
-	$_SESSION['pageNumber'] = 1;
-}
-$pageNumber = $_SESSION['pageNumber'];
-
-// 表示するデータの位置決める
-$limit =  ($pageNumber - 1) * INST_DATA_PER_PAGE;
-$instDataPerPage = INST_DATA_PER_PAGE; -->
-
-<!-- // DB接続 -->
-<!-- $sqlCls = new sqlClass();
-$isDBSuccess = $sqlCls->dbConnection($dbs, $user, $pass, $docSearchPath, __LINE__);
-if (!isset($isDBSuccess)) {
-	$isDBSuccess = true; -->
-
-	<!-- // アルトマーク課題管理表No.2の追加 Start
-	$sql = "SELECT DISTINCT COM_INST.PREFC_CD, MST_PREFC.PREFC_NAME FROM COM_INST JOIN MST_PREFC ON COM_INST.PREFC_CD = MST_PREFC.PREFC_CD ORDER BY MST_PREFC.PREFC_CD";
-	$info = array($sql);
-	$prefc = $sqlCls->dbSelect($info, $docSearchPath, __LINE__);
-	if ($prefc == false) {
-		$isDBSuccess = false;
-	}
-	// アルトマーク課題管理表No.2の追加 End
-}
-?> -->
-
 
 <!--検索フォーム-->
 <body>
@@ -155,17 +25,9 @@ if (!isset($isDBSuccess)) {
 				<tr>
 					<td class="docHeaderTd"><h1>医師検索一覧</h1></td>
 					<td class="docHeaderTdCenter docHeaderTdCenter">
-						<!-- <?php
-						// バッチ処理中判断
-						if(getDateBatchJSString($dbs, $user, $pass) && $isDBSuccess){
-						?> -->
                         {% if ultmarc.is_batch_processing %}
                         <div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
                         {% endif %}
-							
-						<!-- <?php
-						} -->
-						<!-- ?> -->
 					</td>
 					<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
 				</tr>
@@ -179,26 +41,16 @@ if (!isset($isDBSuccess)) {
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd" 
 						value="{{ultmarc.is_input_dcf_pcf_dr_cd()}}" maxlength='10' oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION['docTextbox_1'])) {
-							echo $_SESSION['docTextbox_1'];
-						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">氏名(漢字)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name" 
 						value="{{ultmarc.is_input_dr_name()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
-							echo $_SESSION["docTextbox_2"];
-						}  ?> -->
 					</td>
-					<!-- アルトマーク課題管理表No.8の修正 氏名(カナ)→氏名(かな・カナ) -->
 					<td class="docSearchColumnTd">氏名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana" 
 						value="{{ultmarc.is_input_dr_name_kana()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_3"])) {
-							echo $_SESSION["docTextbox_3"];
-						}  ?> -->
 					</td>
 				</tr>
 				<tr>
@@ -206,35 +58,24 @@ if (!isset($isDBSuccess)) {
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
 						value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" maxlength='11' oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION['docTextbox_4'])) {
-							echo $_SESSION['docTextbox_4'];
-						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">勤務先名(漢字)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji" 
 						value="{{ultmarc.is_input_form_inst_name_kanji()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_5"])) {
-							echo $_SESSION["docTextbox_5"];
-						}  ?> -->
 					</td>
-					<!-- アルトマーク課題管理表No.8の修正 勤務先名(カナ)→勤務先名(かな・カナ) -->
 					<td class="docSearchColumnTd">勤務先名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana" 
 						value="{{ultmarc.is_input_form_inst_name_kana()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_6"])) {
-							echo $_SESSION["docTextbox_6"];
-						}  ?> -->
 					</td>
 				</tr>
 				<tr>
-					<!-- アルトマーク課題管理表No.2の追加 Start -->
 					<td class="docSearchColumnTd">勤務先都道府県：</td>
 					<td class="search_tb">
 						<!-- 都道府県のドロップダウン -->
 						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
-							<!--ToDo 都道府県ドロップダウンの中身を作成(マスタからとってこれる) -->
+							<!-- 都道府県ドロップダウンの中身を作成 -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
                             <option 
@@ -242,32 +83,17 @@ if (!isset($isDBSuccess)) {
                                 {{prefc['prefc_name']}}
                             </option>
                             {% endfor %}
-							<!-- <?php
-							foreach ($prefc as $value){
-							?>
-								<option value="<?php echo $value['PREFC_CD'] ?>" <?php if(isset($_SESSION['docTextbox_11'])) { if($_SESSION['docTextbox_11'] == $value['PREFC_CD']) { echo ' selected'; }};   ?> >
-								<?php echo $value['PREFC_NAME']; ?></option>
-							<?php
-							}
-							?> -->
 						</select>
 					</td>
-					<!-- アルトマーク課題管理表No.2の追加 End -->
 					<td class="docSearchColumnTd">所属部科(漢字)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name" 
 						value="{{ultmarc.is_input_blng_sec_name()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_7"])) {
-							echo $_SESSION["docTextbox_7"];
-						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">診療科目(漢字)：</td>
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name" 
 						value="{{ultmarc.is_input_trt_course_name()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_8"])) {
-							echo $_SESSION["docTextbox_8"];
-						}  ?> -->
 					</td>
 				</tr>
 				<tr>
@@ -275,16 +101,10 @@ if (!isset($isDBSuccess)) {
 					<td class="docSearchTextboxTd">
 						<input class="text docSearchTextbox" type="text" name="ctrl_alma" 
 						value="{{ultmarc.is_input_alma()}}" oninput="formBtDisabled()">
-                        <!-- <?php if(isset($_SESSION["docTextbox_9"])) {
-							echo $_SESSION["docTextbox_9"];
-						}  ?> -->
 					</td>
 					<td class="docSearchColumnTd">卒年：</td>
 					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y" 
-						value="" maxlength='4' oninput="formBtDisabled()"></td>
-                    <!-- <?php if(isset($_SESSION["docTextbox_10"])) {
-                        echo $_SESSION["docTextbox_10"];
-                    }  ?> -->
+						value="{{ultmarc.is_input_grad_y()}}" maxlength='4' oninput="formBtDisabled()"></td>
 					<td class="search_btTd" colspan="2">
 						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();">
 						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
@@ -293,223 +113,13 @@ if (!isset($isDBSuccess)) {
 			</tbody>
 		</table>
 	</form>
-	<!-- <?php
-	// アルトマーク課題管理表No.2の修正(LEFT JOIN MST_PREFC…の2行追加&SELECT COM_DR.DCF_PCF_DR_CD…の最後の検索項目（MST_PREFC.PREFC_NAME）追加) 
-	// アルトマーク課題管理表No.7の修正 旧ソース：$cntSql = "SELECT COUNT(*) AS countNum FROM  (((((((COM_DR)
-	if ((isset($_POST['search_bt']) || isset($_POST['currentPageNum'])  || isset($_POST['docSearchBt']) || isset($_POST['docBackBt'])) && $isDBSuccess && isset($_SESSION['id'])) {
-		$cntSql = "SELECT COUNT(countNum) AS countNum FROM (SELECT COUNT(*) AS countNum FROM  (((((((COM_DR
-		LEFT JOIN MST_PREFC ON COM_DR.PREFC_CD = MST_PREFC.PREFC_CD)
-		LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
-		LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
-		LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
-		LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
-		LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD)
-		LEFT JOIN COM_POST ON COM_DR_WRKPLACE.POST_CD = COM_POST.POST_CD)
-		LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD
-		WHERE ";
-		// アルトマーク課題管理表No.7の修正 旧ソース：SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_INST.FORM_INST_NAME_KANJI, COM_INST.DCF_DSF_INST_CD, COM_BLNG_SEC.BLNG_SEC_NAME, COM_TRT_COURSE.TRT_COURSE_NAME, COM_POST.FORM_POST_NAME, COM_ALMA.ALMA, COM_DR.GRAD_Y, MST_PREFC.PREFC_NAME
-		$sql = "
-		SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_INST.FORM_INST_NAME_KANJI, COM_INST.DCF_DSF_INST_CD, COM_BLNG_SEC.BLNG_SEC_NAME, COM_TRT_COURSE.TRT_COURSE_NAME, COM_POST.FORM_POST_NAME, COM_ALMA.ALMA, COM_DR.GRAD_Y, MST_PREFC.PREFC_NAME, COM_DR_WRKPLACE.BLNG_SEC_CD
-		FROM (((((((COM_DR
-		LEFT JOIN MST_PREFC ON COM_DR.PREFC_CD = MST_PREFC.PREFC_CD)
-		LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
-		LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
-		LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
-		LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
-		LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD)
-		LEFT JOIN COM_POST ON COM_DR_WRKPLACE.POST_CD = COM_POST.POST_CD)
-		LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD
-		WHERE ";
-		$notfirstFlg = false;
-		// もし医師コードが入力されていたら
-		if (!empty($_SESSION["docTextbox_1"])) {
-			$cntSql .= "COM_DR.DCF_PCF_DR_CD LIKE :drCd";
-			$sql .= "COM_DR.DCF_PCF_DR_CD LIKE :drCd";
-			$val[":drCd"] = '%' . htmlspecialchars($_SESSION['docTextbox_1'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし医師名（漢字）が入力されていたら
-		if (!empty($_SESSION["docTextbox_2"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "DR_NAME LIKE :drName";
-			$sql .= "DR_NAME LIKE :drName";
-			$val[":drName"] = '%' . htmlspecialchars($_SESSION['docTextbox_2'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし医師名(カナ)が入力されていたら
-		if (!empty($_SESSION["docTextbox_3"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "DR_NAME_KANA LIKE :drNameKana";
-			$sql .= "DR_NAME_KANA LIKE :drNameKana";
-			$val[":drNameKana"] = '%' .  htmlspecialchars(mb_convert_kana($_SESSION['docTextbox_3'], "khs", "UTF-8"), ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし勤務先コードが入力されていたら
-		if (!empty($_SESSION["docTextbox_4"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "COM_INST.DCF_DSF_INST_CD LIKE :instCd";
-			$sql .= "COM_INST.DCF_DSF_INST_CD LIKE :instCd";
-			$val[":instCd"] = '%' . htmlspecialchars($_SESSION['docTextbox_4'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし勤務先名(漢字)が入力されていたら
-		if (!empty($_SESSION["docTextbox_5"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "FORM_INST_NAME_KANJI LIKE :instNameKanji";
-			$sql .= "FORM_INST_NAME_KANJI LIKE :instNameKanji";
-			$val[":instNameKanji"] = '%' . htmlspecialchars($_SESSION['docTextbox_5'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし勤務先名(カナ)が入力されていたら
-		if (!empty($_SESSION["docTextbox_6"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "FORM_INST_NAME_KANA LIKE :instNameKana";
-			$sql .= "FORM_INST_NAME_KANA LIKE :instNameKana";
-			$val[":instNameKana"] = '%' . htmlspecialchars(mb_convert_kana($_SESSION['docTextbox_6'], "khs", "UTF-8"), ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// アルトマーク課題管理表No.2の追加 Start
-		// もし都道府県が入力されていたら
-		if ($_SESSION["docTextbox_11"] != null) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "COM_INST.PREFC_CD = :prefcCd";
-			$sql .= "COM_INST.PREFC_CD = :prefcCd";
-			$val[":prefcCd"] = htmlspecialchars($_SESSION['docTextbox_11'], ENT_QUOTES);
-			$notfirstFlg = true;
-		}
-		// アルトマーク課題管理表No.2の追加 End
-		// もし所属部科(漢字)が入力されていたら
-		if (!empty($_SESSION["docTextbox_7"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "COM_BLNG_SEC.BLNG_SEC_NAME LIKE :blngSecName";
-			$sql .= "COM_BLNG_SEC.BLNG_SEC_NAME LIKE :blngSecName";
-			$val[":blngSecName"] = '%' .  htmlspecialchars($_SESSION['docTextbox_7'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし診療科目（漢字）が入力されていたら
-		if (!empty($_SESSION["docTextbox_8"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "TRT_COURSE_NAME LIKE :trtCourseName";
-			$sql .= "TRT_COURSE_NAME LIKE :trtCourseName";
-			$val[":trtCourseName"] = '%' .  htmlspecialchars($_SESSION['docTextbox_8'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし出身大学（漢字）が入力されていたら
-		if (!empty($_SESSION["docTextbox_9"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "ALMA LIKE :alma";
-			$sql .= "ALMA LIKE :alma";
-			$val[":alma"] = '%' . htmlspecialchars($_SESSION['docTextbox_9'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-		// もし卒年が入力されていたら
-		if (!empty($_SESSION["docTextbox_10"])) {
-			if ($notfirstFlg) {
-				$cntSql .= " AND ";
-				$sql .= " AND ";
-			}
-			$cntSql .= "GRAD_Y LIKE :gradY";
-			$sql .= "GRAD_Y LIKE :gradY";
-			$val[":gradY"] = htmlspecialchars($_SESSION['docTextbox_10'], ENT_QUOTES) . '%';
-			$notfirstFlg = true;
-		}
-
-		// テキストボックスが未入力なら
-		
-		// アルトマーク課題管理表No.7の修正
-		//if (!(empty($_SESSION["docTextbox_1"]) AND empty($_SESSION["docTextbox_2"]) AND empty($_SESSION["docTextbox_3"]) AND empty($_SESSION["docTextbox_4"]) AND empty($_SESSION["docTextbox_5"]) AND empty($_SESSION["docTextbox_6"]) AND empty($_SESSION["docTextbox_7"]) AND empty($_SESSION["docTextbox_8"]) AND empty($_SESSION["docTextbox_9"]) AND empty($_SESSION["docTextbox_10"]))) {
-		if (!(empty($_SESSION["docTextbox_1"]) AND empty($_SESSION["docTextbox_2"]) AND empty($_SESSION["docTextbox_3"]) AND empty($_SESSION["docTextbox_4"]) AND empty($_SESSION["docTextbox_5"]) AND empty($_SESSION["docTextbox_6"]) AND empty($_SESSION["docTextbox_7"]) AND empty($_SESSION["docTextbox_8"]) AND empty($_SESSION["docTextbox_9"]) AND empty($_SESSION["docTextbox_10"]) AND empty($_SESSION["docTextbox_11"]))) {
-			$sql .=" AND (LENGTH(COM_INST.ABOLISH_YMD) = 0 OR COM_INST.ABOLISH_YMD IS NULL)
-					AND (LENGTH(COM_DR.ABOLISH_YMD) = 0 OR COM_DR.ABOLISH_YMD IS NULL)";
-
-			$cntSql .=" AND (LENGTH(COM_INST.ABOLISH_YMD) = 0 OR COM_INST.ABOLISH_YMD IS NULL)
-					AND (LENGTH(COM_DR.ABOLISH_YMD) = 0 OR COM_DR.ABOLISH_YMD IS NULL)
-					GROUP BY COM_DR.DCF_PCF_DR_CD, COM_INST.DCF_DSF_INST_CD) AS A;"; // アルトマーク課題管理表No.7の修正 GROUP BY ～の1行追加
-					
-			// ソートの基準設定
-			// アルトマーク課題管理表No.7の修正
-			//$sql .= " ORDER BY COM_DR.DCF_PCF_DR_CD";
-			$sql .= " ORDER BY COM_DR.DCF_PCF_DR_CD, COM_DR_WRKPLACE.DCF_DSF_INST_CD, COM_DR_WRKPLACE.BLNG_SEC_CD,COM_DR_TRT_COURSE.TRT_COURSE_CD";
-			// アルトマーク課題管理表No.7の修正
-			//$sql .=" LIMIT {$limit} , {$instDataPerPage};";
-		} else {
-			$sql .= ";";
-			$cntSql .= ";";
-		}
-
-		// 取得件数を計算
-		$info = array($cntSql, $val);
-		$dtCnt = $sqlCls->dbCount($info, $docSearchPath, __LINE__);
-		if ($dtCnt == false) {
-			$isDBSuccess = false;
-		}
-
-		// 件数が500以上かどうか
-		if ($dtCnt['countNum'] > 500) {
-			$resultMaxFlg = true;
-			$dtCnt['countNum'] = 0;
-			$selectDt = array();
-		} else {
-			$resultMaxFlg = false;
-			// データを取得
-			$info = array($sql, $val);
-			$selectDt = $sqlCls->dbSelect($info, $docSearchPath, __LINE__);
-			if ($selectDt == false) {
-				$isDBSuccess = false;
-			}
-		}
-	} else{
-		$resultMaxFlg = false;
-		$dtCnt['countNum'] = 0;
-		$selectDt = array();
-	}
-
-	if (!$isDBSuccess) {
-		$selectDt = array();
-		$dtCnt['countNum'] = 0;
-	}
-
-
-	$sqlCls->dbExit();
-	// ページ数の計算
-	$pageCount = ceil( $dtCnt['countNum'] / INST_DATA_PER_PAGE );
-
-	?> -->
+	
 	<!--検索結果-->
 	<form class="_form" name="result" action="/ultmarc/docSearch" method="POST">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
-        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
-        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
+
 		<!--検索件数-->
-		<!-- <div class="result_info">件数：<?php echo $dtCnt['countNum']; ?>件 ページ数：<?php echo "$pageCount"; ?><br></div> -->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
 		<!--検索結果表示テーブル-->
@@ -528,152 +138,15 @@ if (!isset($isDBSuccess)) {
 						<th>卒年</th>
 					</tr>
 				</thead>
-				<!-- <?php
-				if (isset($_POST['search_bt']) || isset($_POST['currentPageNum']) || isset($_POST['docSearchBt']) || isset($_POST['docBackBt'])) {
-				?> -->
-                    <tbody id="result_data" class="result_data"></tbody>
-					<!-- <tbody>
-						<?php
-						// アルトマーク課題管理表No.7の修正 Start
-						// 同じ所属部課で複数の診療科目を担当する医師情報をマージする
-						$selectDtMerge = array();
-						$beforeDrCd = "";
-						$beforeInstCd = "";
-						$beforeSecCd = "";
-						$limitCount = 0;
-						$pageLastProcEndFlag = false; -->
-						
-						<!-- foreach ($selectDt as $value) {
+                <tbody id="result_data" class="result_data"></tbody>
 
-							// 該当ページ内のデータであるかの判定 -->
-							<!-- if ($limit > $limitCount || $limitCount >= $limit + $instDataPerPage) {
-
-								if ($beforeDrCd != $value['DCF_PCF_DR_CD'] || $beforeInstCd != $value['DCF_DSF_INST_CD'] || $beforeSecCd != $value['BLNG_SEC_CD']) {
-									$beforeDrCd = $value['DCF_PCF_DR_CD'];
-									$beforeInstCd = $value['DCF_DSF_INST_CD'];
-									$beforeSecCd = $value['BLNG_SEC_CD'];
-									$limitCount++;
-								}
-								
-								// 該当ページ内のデータでない場合一覧表示対象ではないのでスキップ
-								continue;
-							} -->
-							
-							<!-- // 同じ医師情報の場合 -->
-							<!-- if ($beforeDrCd === $value['DCF_PCF_DR_CD'] && $beforeInstCd === $value['DCF_DSF_INST_CD'] && $beforeSecCd === $value['BLNG_SEC_CD']) {
-								// 医師情報が設定されていない場合、前のページの最後の医師データなのでスキップ
-								if (count($selectDtMerge) == 0) {
-									$limitCount++;
-									continue;
-								}
-								
-								// 診療科目以外同じ情報という前提で、診療科目だけをマージ（・で区切って追加）
-                                ※　SQLで取りましょう
-								$selectDtMerge[count($selectDtMerge) - 1]['TRT_COURSE_NAME'] .= $delimiterTrtCourceName . $value['TRT_COURSE_NAME'];
-							} -->
-							<!-- // 異なる医師情報の場合
-							else {
-								// 該当ページ内の最後のデータで、同じ医師情報がない場合、該当ページの処理は終わり
-								if ($pageLastProcEndFlag) {
-									$limitCount++;
-									$pageLastProcEndFlag = false;
-									continue;
-								}
-
-								// 医師情報を追加
-								$selectDtMerge[] = $value;
-								$beforeDrCd = $value['DCF_PCF_DR_CD'];
-								$beforeInstCd = $value['DCF_DSF_INST_CD'];
-								$beforeSecCd = $value['BLNG_SEC_CD'];
-								
-								// 該当ページ内の最後のデータの場合、同じ医師情報がある可能性があるので次のデータを検索する為にカウントアップしない
-								if ($limitCount === $limit + $instDataPerPage - 1) {
-									$pageLastProcEndFlag = true;
-								}
-								else {
-									$limitCount++;
-								}
-								
-							}
-						} -->
-						<!-- // アルトマーク課題管理表No.7の修正 End
-						
-						$i = 0;  // チェックボックスの名前つけに利用
-						// アルトマーク課題管理表No.7の修正
-						//foreach ($selectDt as $value) {
-						foreach ($selectDtMerge as $value) {
-							$i++;
-							?>
-							<tr>
-								<td><div class="checkNum"><input type="checkbox" class="checkbox selected" name="data<?php echo $i ?>"  onclick="resultBtDisablead()" value="<?php echo $value['DCF_PCF_DR_CD'] ?>"></div></td>
-								<td><a href="<?php echo $docInfoPath . "/?id=" . $value['DCF_PCF_DR_CD'] ?>"><?php echo $value['DCF_PCF_DR_CD'] ?></a></td>
-								<td><?php echo $value['DR_NAME'] ?></td>
-								<td><a href="<?php echo $instInfoPath . "/?id=" . $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['FORM_INST_NAME_KANJI'] ?></a></td>
-								<td><?php echo $value['BLNG_SEC_NAME'] ?></td>
-								<td><?php echo $value['TRT_COURSE_NAME'] ?></td>
-								<td><?php echo $value['FORM_POST_NAME'] ?></td>
-								<td><?php echo $value['ALMA'] ?></td>
-								<td><?php echo $value['GRAD_Y'] ?></td>
-							</tr>
-							<?php
-						}
-						?> -->
-					<!-- </tbody>
-				<?php
-				}
-				?> -->
 			</table>
             
-			<!-- 
-    
-                ※　ここに埋めよう
-            <?php
-			if ($resultMaxFlg  && $isDBSuccess) {
-			?>
-				<div class="notFind"><?php echo $resultMaxMsg ?></div>
-			<?php
-			} else if (isset($_POST['search_bt']) && $dtCnt['countNum'] <= 0  && $isDBSuccess){
-			?>
-				<div class="notFind"><?php echo $notFindMsg ?></div>
-			<?php
-			} ?> -->
 		</div>
 		<!--操作ボタン-->
 		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報">
 	</form>
 
-	<!-- ダイアログ -->
-	<!-- <div id="error" title="エラー">
-		<div style="float: left;width: 15%"><img class="ErrorImg" style="width: 50px;" src="/common/css/image/error.png"></div>
-		<div id="errorTxt" style="float: right; white-space: normal; width: 300px;"></div>
-	</div> -->
-	<!-- <?php
-	// DBエラーしていないか
-	if(!$isDBSuccess){
-		print "<script language=javascript>CreateDialog();</script>";
-		print "<script language=javascript>DisplayErrorDialog('$dbErrMsg');</script>";
-	}
-	?> -->
-
-    <!-- DB接続失敗エラーモーダル -->
-    <!-- {% with 
-        modal_id='ErrorModal_DB',
-        modal_title='エラー',
-        message='DB接続に失敗しました。管理者にお問い合わせください。',
-        icon_key='warning',
-        modal_close_event='location.href="/logout?reason="',
-        buttons = [
-            {
-                'id': 'error_modal_db',
-                'class': 'btn btn-primary',
-                'text': 'OK',
-                'onclick_event': 'location.href="/logout?reason=''"'
-            }
-        ]
-    %}
-    {% include '_modal.html' %}
-    {% endwith %} -->
-
 	<script type="text/javascript">
         // <! --ページネーションの作成-- >
         $(function() {
@@ -686,7 +159,6 @@ if (!isset($isDBSuccess)) {
                 return
             }
             $(".pagination").pagination({
-                // 以下はテスト用コード
                 dataSource: function(done) {
                     done(searchResultData)
                 },
@@ -708,26 +180,34 @@ if (!isset($isDBSuccess)) {
             const display_keys = [
 				'dcf_pcf_dr_cd',
 				'dr_name',
-				'form_inst_name_kanji',
 				'dcf_dsf_inst_cd',
 				'blng_sec_name',
 				'trt_course_name',
 				'form_post_name',
 				'alma',
-				'grad_y',
-				'prefc_name',
-				'blng_sec_cd'
+				'grad_y'
             ];
-            const tableRow = document.createElement('tr')
-            return datas.map(function (data) {
-                return  `
-                <tr class="result_data">
-                    ${display_keys.map((key) =>`<td>${data[key] || ''}</td>`)}
-                </tr>
-                `
-            })
-            return tableRow
-        }
+			return datas.map(function (data, index) {
+				let td = display_keys.map((key) =>{
+					let inner_content = data[key];
+					if(key=='dcf_pcf_dr_cd')
+						inner_content = `<a href="/ultmarc/docInfo?id=${data['dcf_pcf_dr_cd']}">${data['dcf_pcf_dr_cd']  || ''}</a>`;
+					if(key=='dcf_dsf_inst_cd')
+						inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}">${data['form_inst_name_kanji']  || ''}</a>`;
+					return `<td>${inner_content || ''}</td>`
+				});
+				return  `
+				<tr class="result_data">
+					<td><div class="checkNum">
+						<input type="checkbox" class="checkbox selected" name="data${index+1}"  onclick="resultBtDisablead()" 
+						value=${data['dcf_pcf_dr_cd']}>
+					</div></td>
+					${td}
+				</tr>
+				`
+				
+			})
+		}
 </script>
 </body>
 </html>
\ No newline at end of file

From 16a62a9cfc431c6c309580ed56d0d47e1b948e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 6 Jun 2023 11:43:18 +0900
Subject: [PATCH 08/24] =?UTF-8?q?=E5=8C=BB=E5=B8=AB=E6=83=85=E5=A0=B1?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=B5=90=E6=9E=9C=EF=BC=91=E4=BB=B6=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |  39 +-
 .../src/model/db/ultmarc_doctor_info.py       |  18 +
 .../src/model/db/ultmarc_doctor_wrkplace.py   |  15 +
 .../model/db/ultmarc_doctor_wrkplace_his.py   |  16 +
 .../src/model/db/ultmarc_sosiety.py           |  10 +
 .../model/db/ultmarc_specialist_license.py    |  10 +
 .../src/model/db/ultmarc_trt_course.py        |   9 +
 .../view/ultmarc_doctor_info_view_model.py    |  97 ++++
 .../repositories/ultmarc_doctor_repository.py |  39 +-
 .../ultmarc_dr_wrkplace_his_repository.py     |  39 ++
 .../ultmarc_dr_wrkplace_repository.py         |  39 ++
 .../ultmarc_sosiety_repository.py             |  30 ++
 .../ultmarc_specialist_license_repository.py  |  31 ++
 .../ultmarc_trt_course_repository.py          |  31 ++
 .../src/services/ultmarc_view_service.py      |  53 +-
 ecs/jskult-webapp/src/templates/docInfo.html  | 486 ++++++++++++++++++
 .../src/templates/docSearch.html              |  24 +-
 17 files changed, 969 insertions(+), 17 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_sosiety.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_specialist_license.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
 create mode 100644 ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
 create mode 100644 ecs/jskult-webapp/src/templates/docInfo.html

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 133f6c64..399ca6e4 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -7,10 +7,8 @@ from starlette import status
 from src.depends.services import get_service
 from src.model.internal.session import UserSession
 from src.model.request.ultmarc_doctor import UltmarcDoctorModel
-from src.model.view.bio_view_model import BioViewModel
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
-from src.services.bio_view_service import BioViewService
 from src.services.ultmarc_view_service import UltmarcViewService
 from src.services.session_service import set_session
 from src.system_var import constants
@@ -97,3 +95,40 @@ def search_doc(
         headers={'session_key': session_key}
     )
     return templates_response
+
+
+@router.get('/docInfo')
+def ultmarc_doctor_info_view(
+    request: Request,
+    id: str,
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
+    # 医師情報の取得
+    ultmarc = ultmarc_service.info_ultmarc_doctor_view(id, session)
+    # バッチ起動判定の取得
+    ultmarc.is_batch_processing = is_batch_processing
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'docInfo.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py
new file mode 100644
index 00000000..6f20dfb9
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_info.py
@@ -0,0 +1,18 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorInfoDBModel(BaseDBModel):
+    dcf_pcf_dr_cd: Optional[str]
+    dr_name: Optional[str]
+    dr_name_kana: Optional[str]
+    sex: Optional[str]
+    birthday: Optional[str]
+    alma: Optional[str]
+    hometown: Optional[str]
+    grad_y: Optional[str]
+    drday_y: Optional[str]
+    estab_y: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
new file mode 100644
index 00000000..c8f555cc
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
@@ -0,0 +1,15 @@
+from typing import Optional
+from datetime import date
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorWrkplaceDBModel(BaseDBModel):
+    dcf_dsf_inst_cd: Optional[str]
+    inst_name_kanji: Optional[str]
+    blng_sec_name: Optional[str]
+    univ_post_name: Optional[str]
+    post_name: Optional[str]
+    aply_start_ymd: Optional[date]
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
new file mode 100644
index 00000000..3fe3de38
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_his.py
@@ -0,0 +1,16 @@
+from typing import Optional
+from datetime import date
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorWrkplaceHisDBModel(BaseDBModel):
+    dcf_dsf_inst_cd: Optional[str]
+    inst_name_kanji: Optional[str]
+    blng_sec_name: Optional[str]
+    univ_post_name: Optional[str]
+    post_name: Optional[str]
+    aply_start_ymd: Optional[date]
+    aply_end_ymd: Optional[date]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_sosiety.py b/ecs/jskult-webapp/src/model/db/ultmarc_sosiety.py
new file mode 100644
index 00000000..ab76e4db
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_sosiety.py
@@ -0,0 +1,10 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcSosietyDBModel(BaseDBModel):
+    sosiety_cd: Optional[str]
+    sosiety_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_specialist_license.py b/ecs/jskult-webapp/src/model/db/ultmarc_specialist_license.py
new file mode 100644
index 00000000..8cccb4eb
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_specialist_license.py
@@ -0,0 +1,10 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcSpecialistLicenseDBModel(BaseDBModel):
+    specialist_cd: Optional[str]
+    specialist_license_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py b/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
new file mode 100644
index 00000000..23908fce
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
@@ -0,0 +1,9 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcTrtCoursedbmodel(BaseDBModel):
+    trt_course_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
new file mode 100644
index 00000000..1cfbcf5f
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -0,0 +1,97 @@
+import json
+from collections import OrderedDict
+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.system_var import environment
+
+
+class UltmarcDoctorInfoViewModel(BaseModel):
+    subtitle: str = '医師情報'
+    is_batch_processing: Optional[bool]
+    doctor_info_data: Optional[UltmarcDoctorInfoDBModel]
+    trt_coursed_data: Optional[list[UltmarcTrtCoursedbmodel]]
+    sosiety_data: Optional[list[UltmarcSosietyDBModel]]
+    specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
+    doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]
+    doctor_wrkplace_his_data: Optional[list[UltmarcDoctorWrkplaceHisDBModel]]
+
+    def ultmarc_data_json_str(self):
+        def date_handler(obj):
+            return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+        return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
+
+    # 医師コード
+    def is_input_dcf_pcf_dr_cd(self):
+        return self.doctor_info_data.dcf_pcf_dr_cd or ''
+
+    # 氏名(漢字)
+    def is_input_dr_name(self):
+        return self.doctor_info_data.dr_name or ''
+
+    # 氏名(かな・カナ)
+    def is_input_dr_name_kana(self):
+        return self.doctor_info_data.dr_name_kana or ''
+
+    # 性別
+    def is_input_sex(self):
+        return self.doctor_info_data.sex or ''
+
+    # 出身大学
+    def is_input_alma(self):
+        return self.doctor_info_data.alma or ''
+
+    # 出身県
+    def is_input_hometown(self):
+        return self.doctor_info_data.hometown or ''
+
+    # 卒年
+    def is_input_grad_y(self):
+        return self.doctor_info_data.grad_y or ''
+
+    # 登録年
+    def is_input_drday_y(self):
+        return self.doctor_info_data.drday_y or ''
+
+    # 開業年
+    def is_input_estab_y(self):
+        return self.doctor_info_data.estab_y or ''
+
+    def is_input_birthday_fromat(self):
+        return self._format_date_string(self.doctor_info_data.birthday)
+
+    def is_input_trt_course_data_size(self):
+        return len(self.trt_coursed_data)
+
+    def is_data_string_empty_fromat(self, data_string):
+        return data_string or ''
+
+    def disabled_button(self):
+        return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
+
+    def is_form_submitted(self):
+        return self.form_data is not None
+
+    def is_data_empty(self):
+        return len(self.doctor_data) == 0
+
+    def is_data_overflow_max_length(self):
+        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+
+    def _format_date_string(self, date_string):
+        if date_string is None:
+            return ''
+        date = datetime.strptime(date_string, '%Y%m%d')
+        return date.strftime('%Y/%m/%d')
+
+    def _selected_value(self, form_value: str, current_value: str):
+        return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index f9293893..60f1543d 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -2,6 +2,7 @@ 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.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
 
@@ -15,7 +16,7 @@ class UltmarcDoctorRepository(BaseRepository):
         com_inst.form_inst_name_kanji,
         com_inst.dcf_dsf_inst_cd,
         com_blng_sec.blng_sec_name,
-        com_trt_course.trt_course_name,
+        GROUP_CONCAT(com_trt_course.trt_course_name separator ' / ')  AS trt_course_name,
         com_post.form_post_name,
         com_alma.alma,
         com_dr.grad_y,
@@ -33,6 +34,7 @@ class UltmarcDoctorRepository(BaseRepository):
     LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
     WHERE
         {where_clause}
+    GROUP BY com_dr.dcf_pcf_dr_cd
     ORDER BY
         com_dr.dcf_pcf_dr_cd,
         com_dr_wrkplace.dcf_dsf_inst_cd,
@@ -128,3 +130,38 @@ class UltmarcDoctorRepository(BaseRepository):
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
+
+    FETCH_ONE_SQL = """\
+        SELECT
+            com_dr.dcf_pcf_dr_cd,
+            com_dr.dr_name,
+            com_dr.dr_name_kana,
+            com_sex.sex,
+            com_dr.birthday,
+            com_alma.alma,
+            com_hometown.hometown,
+            com_dr.grad_y,
+            com_dr.drday_y,
+            com_dr.estab_y
+        FROM src05.com_dr
+        LEFT JOIN src05.com_sex ON com_dr.sex_cd = com_sex.sex_cd
+        LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
+        LEFT JOIN src05.com_hometown ON com_dr.hometown_cd = com_hometown.hometown_cd
+        WHERE dcf_pcf_dr_cd = :id
+    """
+
+    def fetch_one(self, id) -> UltmarcDoctorInfoDBModel:
+        try:
+            self._database.connect()
+            query = self.FETCH_ONE_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcDoctorInfoDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models[0]
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
new file mode 100644
index 00000000..14f0de45
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
@@ -0,0 +1,39 @@
+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.aply_start_ymd
+        FROM src05.com_dr
+        LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd
+        LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd
+        LEFT JOIN src05.com_blng_sec ON com_dr_wrkplace.blng_sec_cd = com_blng_sec.blng_sec_cd
+        LEFT JOIN src05.com_post as univ_post ON com_dr_wrkplace.identity_cd = univ_post.post_cd
+        LEFT JOIN src05.com_post as post ON com_dr_wrkplace.post_cd = post.post_cd
+        WHERE com_dr.dcf_pcf_dr_cd = :id
+        ORDER BY com_dr_wrkplace.aply_start_ymd DESC
+    """
+
+    def fetch_many(self, id) -> list[UltmarcDoctorWrkplaceHisDBModel]:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcDoctorWrkplaceHisDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
new file mode 100644
index 00000000..fd1295d7
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
@@ -0,0 +1,39 @@
+from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel
+from src.repositories.base_repository import BaseRepository
+
+
+class UltmarcDoctorWrkplaceRepository(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.aply_start_ymd
+        FROM src05.com_dr
+        LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd
+        LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd
+        LEFT JOIN src05.com_blng_sec ON com_dr_wrkplace.blng_sec_cd = com_blng_sec.blng_sec_cd
+        LEFT JOIN src05.com_post as univ_post ON com_dr_wrkplace.identity_cd = univ_post.post_cd
+        LEFT JOIN src05.com_post as post ON com_dr_wrkplace.post_cd = post.post_cd
+        WHERE com_dr.dcf_pcf_dr_cd = :id
+        ORDER BY com_dr_wrkplace.aply_start_ymd DESC
+    """
+
+    def fetch_many(self, id) -> list[UltmarcDoctorWrkplaceDBModel]:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcDoctorWrkplaceDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py
new file mode 100644
index 00000000..e3c9ac13
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py
@@ -0,0 +1,30 @@
+from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel
+from src.repositories.base_repository import BaseRepository
+
+
+class UltmarcSosietyRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        SELECT com_sosiety.sosiety_cd, com_sosiety.sosiety_name
+        FROM src05.com_dr
+        LEFT JOIN src05.com_dr_sosiety ON com_dr.dcf_pcf_dr_cd = com_dr_sosiety.dcf_pcf_dr_cd
+        LEFT JOIN src05.com_sosiety ON com_dr_sosiety.sosiety_cd = com_sosiety.sosiety_cd
+        WHERE com_dr.dcf_pcf_dr_cd = :id
+        ORDER BY com_sosiety.sosiety_cd
+    """
+
+    def fetch_many(self, id) -> list[UltmarcSosietyDBModel]:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcSosietyDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
new file mode 100644
index 00000000..35632081
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
@@ -0,0 +1,31 @@
+from src.model.db.ultmarc_specialist_license import UltmarcSpecialistLicenseDBModel
+from src.repositories.base_repository import BaseRepository
+
+
+class UltmarcSpecialistLicenseRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        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
+        LEFT JOIN src05.com_specialist_license ON com_sp_field.specialist_cd = com_specialist_license.specialist_cd
+        WHERE com_dr.dcf_pcf_dr_cd = :id
+        ORDER BY com_specialist_license.specialist_cd
+    """
+
+    def fetch_many(self, id) -> UltmarcSpecialistLicenseDBModel:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcSpecialistLicenseDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
new file mode 100644
index 00000000..f50fc02a
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
@@ -0,0 +1,31 @@
+from src.model.db.ultmarc_trt_course import UltmarcTrtCoursedbmodel
+from src.repositories.base_repository import BaseRepository
+
+
+class UltmarcTrtCourseRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        SELECT 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
+        WHERE com_dr.dcf_pcf_dr_cd = :id
+        ORDER BY com_trt_course.trt_course_cd
+    """
+
+    def fetch_many(self, id) -> list[UltmarcTrtCoursedbmodel]:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+
+            models = [UltmarcTrtCoursedbmodel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 140863e7..1b207c5e 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -9,9 +9,15 @@ from src.aws.s3 import S3Client
 from src.model.internal.session import UserSession
 from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
+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.ultmarc_doctor_repository import UltmarcDoctorRepository
+from src.repositories.ultmarc_trt_course_repository import UltmarcTrtCourseRepository
+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.services.base_service import BaseService
 from src.system_var import constants, environment
 
@@ -19,16 +25,31 @@ from src.system_var import constants, environment
 class UltmarcViewService(BaseService):
     REPOSITORIES = {
         'ultmarc_doctor_repository': UltmarcDoctorRepository,
-        'prefc_repository': PrefcMasterRepository
+        'prefc_repository': PrefcMasterRepository,
+        'ultmarc_trt_course_repository': UltmarcTrtCourseRepository,
+        'ultmarc_sosiety_repository': UltmarcSosietyRepository,
+        'ultmarc_doctor_wrkplace_repository': UltmarcDoctorWrkplaceRepository,
+        'ultmarc_doctor_wrkplace_his_repository': UltmarcDoctorWrkplaceHisRepository,
+        'ultmarc_specialist_license_repository': UltmarcSpecialistLicenseRepository
     }
 
     ultmarc_doctor_repository: UltmarcDoctorRepository
     prefc_repository: PrefcMasterRepository
+    ultmarc_trt_course_repository: UltmarcTrtCourseRepository
+    ultmarc_sosiety_repository: UltmarcSosietyRepository
+    ultmarc_doctor_wrkplace_repository: UltmarcDoctorWrkplaceRepository
+    ultmarc_doctor_wrkplace_his_repository: UltmarcDoctorWrkplaceHisRepository
+    ultmarc_specialist_license_repository: UltmarcSpecialistLicenseRepository
 
     def __init__(self, repositories: dict[str, BaseRepository], clients: dict[str, AWSAPIClient]) -> None:
         super().__init__(repositories, clients)
         self.ultmarc_doctor_repository = repositories['ultmarc_doctor_repository']
         self.prefc_repository = repositories['prefc_repository']
+        self.ultmarc_trt_course_repository = repositories['ultmarc_trt_course_repository']
+        self.ultmarc_sosiety_repository = repositories['ultmarc_sosiety_repository']
+        self.ultmarc_doctor_wrkplace_repository = repositories['ultmarc_doctor_wrkplace_repository']
+        self.ultmarc_doctor_wrkplace_his_repository = repositories['ultmarc_doctor_wrkplace_his_repository']
+        self.ultmarc_specialist_license_repository = repositories['ultmarc_specialist_license_repository']
 
     def prepare_ultmarc_doctor_view(
         self,
@@ -46,3 +67,33 @@ class UltmarcViewService(BaseService):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
         return ultmarc_doctor_data
+
+    def info_ultmarc_doctor_view(
+        self,
+        id,
+        session: UserSession
+    ) -> UltmarcDoctorInfoViewModel:
+
+        # 医師情報画面の表示データ取得
+        # 医師情報を取得
+        doctor_info = self.ultmarc_doctor_repository.fetch_one(id)
+        # 診療科目情報を取得
+        trt_course = self.ultmarc_trt_course_repository.fetch_many(id)
+        # 所属学会情報を取得
+        sosiety = self.ultmarc_sosiety_repository.fetch_many(id)
+        # 所属学会専門医情報を取得
+        specialist_license = self.ultmarc_specialist_license_repository.fetch_many(id)
+        # 勤務先情報を取得
+        wrkplace = self.ultmarc_doctor_wrkplace_repository.fetch_many(id)
+        # 勤務先履歴情報を取得
+        wrkplace_his = self.ultmarc_doctor_wrkplace_his_repository.fetch_many(id)
+
+        ultmarc = UltmarcDoctorInfoViewModel(
+            doctor_info_data=doctor_info,
+            trt_coursed_data=trt_course,
+            sosiety_data=sosiety,
+            specialist_license_data=specialist_license,
+            doctor_wrkplace_data=wrkplace,
+            doctor_wrkplace_his_data=wrkplace_his
+        )
+        return ultmarc
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
new file mode 100644
index 00000000..e9214447
--- /dev/null
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -0,0 +1,486 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    {% with subtitle = ultmarc.subtitle %}
+    {% include '_header.html' %}
+    {% endwith  %}
+	<title>医師情報</title>
+	<link rel="stylesheet" href="/static/css/ultStyle.css">
+	<script type="text/javascript">
+		window.onload = function(){
+            // 見出し固定初期化
+            FixedMidashi.create();
+            // ボタン、テキストボックス初期化
+            formBtDisabled();
+		}
+	</script>
+</head>
+
+<!-- <?php
+// 検索一覧から表示したいものを配列に入れ直し -->
+<!-- if(isset($_GET['id'])){
+	$docId[0] = $_GET['id'];
+	$pageNum = 0; -->
+
+<!-- } else if(isset($_POST['next'])){
+	// ページ数を+1
+	$pageNum = $_POST['pageNum'] + 1;
+	$postCnt = count($_POST);
+	// 施設コード以外の情報を入れないために$postCnt - 2
+	for ($i = 0; $i < $postCnt - 2; $i++) {
+		$docId[$i] = array_shift($_POST);
+	}
+
+} else if (isset($_POST['prev'])) {
+	// ページ数を-1
+	$pageNum = $_POST['pageNum'] - 1;
+	$postCnt = count($_POST);
+	// 施設コード以外の情報を入れないために$postCnt - 2
+	for ($i = 0; $i < $postCnt - 2; $i++) {
+		$docId[$i] = array_shift($_POST);
+	}
+
+} else if(isset($_POST['detail'])){
+	$pageNum = 0;
+	$postCnt = count($_POST);
+	for ($i = 0; $i < $postCnt - 1; $i++) {
+		$docId[$i] = array_shift($_POST);
+	}
+} else{
+	header('Location: ' . $logoutPath);
+} -->
+
+<!-- $pageCnt = count($docId);
+$sqlCls = new sqlClass();
+$isDBSuccess = $sqlCls->dbConnection($dbs, $user, $pass, $docInfoPath, __LINE__);
+
+// データベース接続チェック
+if (!isset($isDBSuccess)) {
+	$isDBSuccess = true;
+	// 医師情報SQL
+	$sql = "
+	SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_DR.DR_NAME_KANA, COM_SEX.SEX, COM_DR.BIRTHDAY, COM_ALMA.ALMA, COM_HOMETOWN.HOMETOWN, COM_DR.GRAD_Y, COM_DR.DRDAY_Y, COM_DR.ESTAB_Y
+	FROM ((COM_DR
+	LEFT JOIN COM_SEX ON COM_DR.SEX_CD = COM_SEX.SEX_CD)
+	LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD)
+	LEFT JOIN COM_HOMETOWN ON COM_DR.HOMETOWN_CD = COM_HOMETOWN.HOMETOWN_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$docDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($docDt == false) {
+		$isDBSuccess = false;
+	}
+
+	// 診療科目SQL
+	$sql = "
+	SELECT TRT_COURSE_NAME FROM (COM_DR
+	LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
+	LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id
+	ORDER BY COM_TRT_COURSE.TRT_COURSE_CD;";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$trtDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($trtDt == false) {
+		$isDBSuccess = false;
+	}
+
+	// 学会SQL
+	$sql = "
+	SELECT COM_SOSIETY.SOSIETY_CD, COM_SOSIETY.SOSIETY_NAME
+	FROM (COM_DR
+	LEFT JOIN COM_DR_SOSIETY ON COM_DR.DCF_PCF_DR_CD = COM_DR_SOSIETY.DCF_PCF_DR_CD)
+	LEFT JOIN COM_SOSIETY ON COM_DR_SOSIETY.SOSIETY_CD = COM_SOSIETY.SOSIETY_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id
+	ORDER BY COM_SOSIETY.SOSIETY_CD;";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$sosietyDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($sosietyDt == false) {
+		$isDBSuccess = false;
+	}
+
+	// 専門医SQL
+	$sql = "
+	SELECT COM_SPECIALIST_LICENSE.SPECIALIST_CD, COM_SPECIALIST_LICENSE.SPECIALIST_LICENSE_NAME
+	FROM (COM_DR
+	LEFT JOIN COM_SP_FIELD ON COM_DR.DCF_PCF_DR_CD = COM_SP_FIELD.DCF_PCF_DR_CD)
+	LEFT JOIN COM_SPECIALIST_LICENSE ON COM_SP_FIELD.SPECIALIST_CD = COM_SPECIALIST_LICENSE.SPECIALIST_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id
+	ORDER BY COM_SPECIALIST_LICENSE.SPECIALIST_CD;";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$spcialistDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($spcialistDt == false) {
+		$isDBSuccess = false;
+	}
+
+	// 勤務先SQL
+	$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.APLY_START_YMD
+	FROM ((((COM_DR
+	LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
+	LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
+	LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
+	LEFT JOIN COM_POST AS UNIV_POST ON COM_DR_WRKPLACE.IDENTITY_CD = UNIV_POST.POST_CD)
+	LEFT JOIN COM_POST AS POST ON COM_DR_WRKPLACE.POST_CD = POST.POST_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id
+	ORDER BY COM_DR_WRKPLACE.APLY_START_YMD DESC;";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$wrkplaceDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($wrkplaceDt == false) {
+		$isDBSuccess = false;
+	}
+
+	// 勤務先履歴SQL
+	$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, 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)
+	LEFT JOIN COM_INST ON COM_DR_WRKPLACE_HIS.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
+	LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE_HIS.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
+	LEFT JOIN COM_POST AS UNIV_POST ON COM_DR_WRKPLACE_HIS.IDENTITY_CD = UNIV_POST.POST_CD)
+	LEFT JOIN COM_POST AS POST ON COM_DR_WRKPLACE_HIS.POST_CD = POST.POST_CD
+	WHERE COM_DR.DCF_PCF_DR_CD = :id
+	ORDER BY COM_DR_WRKPLACE_HIS.APLY_END_YMD DESC, COM_DR_WRKPLACE_HIS.APLY_START_YMD DESC;";
+	$val[':id'] = $docId[$pageNum];
+	$info = array($sql, $val);
+	$wrkplaceHisDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
+	if ($wrkplaceHisDt == false) {
+		$isDBSuccess = false;
+	}
+
+	$val = null;
+	$info = null;
+	$sqlCls->dbExit();
+	$sqlCls =null;
+} else {
+	$docDt = array(array(
+		'DCF_PCF_DR_CD' => '',
+		'DR_NAME' => '',
+		'DR_NAME_KANA' => '',
+		'SEX' => '',
+		'BIRTHDAY' => '',
+		'ALMA' => '',
+		'HOMETOWN' =>'',
+		'GRAD_Y' => '',
+		'DRDAY_Y' => '',
+		'ESTAB_Y' =>'',
+	));
+	$trtDt = array();
+	$sosietyDt = array(array('SOSIETY_CD' => '　', 'SOSIETY_NAME' => '　'));
+	$spcialistDt = array(array('SPECIALIST_CD' => '　', 'SPECIALIST_LICENSE_NAME' => '　'));
+	$wrkplaceDt = array(array('DCF_DSF_INST_CD' => '', 'INST_NAME_KANJI' => '', 'BLNG_SEC_NAME' => '', 'UNIV_POST_NAME' => '', 'POST_NAME' => '', 'APLY_START_YMD' => ''));
+	$wrkplaceHisDt = array(array('DCF_DSF_INST_CD' => '', 'INST_NAME_KANJI' => '', 'BLNG_SEC_NAME' => '', 'UNIV_POST_NAME' => '', 'POST_NAME' => '', 'APLY_START_YMD' => ''));
+}
+	?> -->
+
+<body>
+	<table class="docHeaderTable">
+		<tr>
+			<td class="docHeaderTd"><h1>医師情報</h1></td>
+			<td class="docHeaderTdCenter docHeaderTdCenter">
+				{% if ultmarc.is_batch_processing %}
+				<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+				{% endif %}
+			</td>
+			<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
+		</tr>
+	</table>
+    
+	<!-- 上部のボタン -->
+	<table class="instHeaderTable">
+		<tr>
+			<form name="instInfo" method="post" action="/ultmarc/docInfo">
+				<!-- <?php
+				for ($i = 0; $i < count($docId); $i++) {
+				?> -->
+					<input type="hidden" name="ctrl_docId" value="">
+					<!-- <?php echo $i ?> -->
+					<!-- <?php echo $docId[$i] ?> -->
+				<!-- <?php
+				}
+				?> -->
+				<input type="hidden" name="pageNum" value="">
+				<!-- <?php echo $pageNum ?> -->
+				<td class="instHeaderTd">
+					<input type="submit" name="prev" value="前" class="transitionBt" >
+					<!-- <?php if ($pageNum == 0) {echo "disabled";	} ?> -->
+				</td>
+				<td class="instHeaderTd">
+				<!-- <?php
+					echo $pageNum + 1 , '／', $pageCnt;
+				?> -->
+				</td>
+				<td class="instHeaderTd">
+					<input type="submit" name="next" value="次" class="transitionBt" >
+					<!-- <?php if ($pageNum == $pageCnt - 1) {echo "disabled"; } ?> -->
+				</td>
+			</form>
+			<form name="instSearch" method="get" action="/ultmarc/docSearch">
+				<td class="instHeaderTd">
+					<input type="submit" name="ctrl_docBackBt" class="transitionBt" value="医師検索一覧へ">
+				</td>
+			</form>
+		</tr>
+	</table>
+	<!-- <?php
+	foreach ($docDt as $value) {
+	?> -->
+	<table class="docInfoTable">
+		<tbody>
+			<tr>
+				<td class="docInfoTd">医師コード:</td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_pcf_dr_cd()}}"></td>
+				<td>氏名(漢字):</td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dr_name()}}"></td>
+				<td>氏名(カナ):</td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dr_name_kana()}}"></td>
+			</tr>
+			<tr>
+				<td class="docInfoTd">性別：</td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_sex()}}"></td>
+				<td>生年月日:</td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_fromat()}}"></td>
+			</tr>
+			<tr>
+				<td colspan="6" class="docInfoTd">
+					出身大学:
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_alma()}}">
+					出身県:
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_hometown()}}">
+					卒年:
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_grad_y()}}">
+					登録年:
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_drday_y()}}">
+					開業年:
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_estab_y()}}">
+				</td>
+			</tr>
+		<!-- <?php
+		}
+
+		?> -->
+			<tr>
+				<td colspan="6" class="docInfoTd">
+					診療科目:
+				<!-- <?php
+					{{ultmarc.trt_coursed_data.trt_course_name}}
+
+				$i = 0;
+				foreach ($trtDt as $value) {
+				?> -->
+				{% for trt_coursed_data in ultmarc.trt_coursed_data %}
+				<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="{{trt_coursed_data.trt_course_name}}">
+				{% endfor %}
+
+					
+					<!-- <?php echo $value['TRT_COURSE_NAME'] ?>
+				<?php
+					$i++;
+				}
+				while($i < 5){
+				?> -->
+				{% for i in range(5-ultmarc.is_input_trt_course_data_size())%}
+					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="">
+				{% endfor %}
+				<!-- <?php
+					$i++;
+				}
+				?> -->
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!-- 所属学会,所属学会専門医 -->
+	<table class="docBelongTable">
+		<tbody>
+			<tr>
+				<td class="docBelongTd  rightBoderLine">
+					<h1>所属学会</h1>
+					<div class="scroll">
+						<table class="tablesorter docSocietyTable" _fixedhead='rows:1; cols:0;'>
+							<thead>
+								<tr>
+									<th>コード</th>
+									<th>所属学会</th>
+								</tr>
+							</thead>
+							<tbody>
+								<!-- <?php
+								foreach ($sosietyDt as $value) {
+								?>
+								
+									<tr>
+										<td><?php if ($value['SOSIETY_CD'] == '') {echo "　";} else{ echo $value['SOSIETY_CD']; } ?></td>
+										<td><?php if ($value['SOSIETY_NAME'] == '') {echo "　";} else{ echo $value['SOSIETY_NAME']; } ?></td>
+									</tr>
+								
+								<?php
+								}
+								?> -->
+								{% for sosiety_data in ultmarc.sosiety_data %}
+									<tr>
+										<td>{{ultmarc.is_data_string_empty_fromat(sosiety_data.sosiety_cd)}}</td>
+										<td>{{ultmarc.is_data_string_empty_fromat(sosiety_data.sosiety_name)}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</div>
+				</td>
+				<td class="docBelongTd">
+					<h1>所属学会専門医</h1>
+					<div class="scroll">
+						<table class="tablesorter docSocietyTable" _fixedhead='rows:1; cols:0; border-color:gray; border-width:2px;'>
+							<thead>
+								<tr>
+									<th>コード</th>
+									<th>専門医資格名</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for specialist_license_data in ultmarc.specialist_license_data %}
+									<tr>
+										<td>{{ultmarc.is_data_string_empty_fromat(specialist_license_data.specialist_cd)}}</td>
+										<td>{{ultmarc.is_data_string_empty_fromat(specialist_license_data.specialist_license_name)}}</td>
+									</tr>
+								{% endfor %}
+								<!-- <?php
+								foreach ($spcialistDt as $value) {
+								?>
+									<tr>
+										<td><?php if ($value['SPECIALIST_CD'] == '') {echo "　";} else{ echo $value['SPECIALIST_CD']; } ?></td>
+										<td><?php if ($value['SPECIALIST_LICENSE_NAME'] == '') {echo "　";} else{ echo $value['SPECIALIST_LICENSE_NAME']; } ?></td>
+									</tr>
+								<?php
+								}
+								?> -->
+							</tbody>
+						</table>
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<!-- 勤務先履歴 -->
+	<h1 class="wrkplaceH1">勤務先履歴</h1>
+	<div class="scroll">
+    	<table class="tablesorter wrkplaceTable" _fixedhead='rows:1; cols:0; border-color:gray; border-width:2px;'>
+			<thead>
+				<tr>
+					<!-- MINE残課題対応No25 START -->
+					<th>ULT施設コード</th>
+					<!-- MINE残課題対応No25 END -->
+					<th>勤務先略名</th>
+					<th>所属部科名</th>
+					<th>役職名</th>
+					<th>職位</th>
+    				<!-- MINE残課題対応No10 START -->
+					<th>開始年月日</th>
+					<th>終了年月日</th>
+    				<!-- MINE残課題対応No10 END -->
+				</tr>
+			</thead>
+			<tbody>
+				<!-- <?php
+				$dispBlankFlg = false;
+				foreach ($wrkplaceDt as $value) {
+					// ヒットしたデータがなかった場合
+					if (empty($value['INST_NAME_KANJI'])) {
+						$dispBlankFlg = true;
+						break;
+					}
+				?>
+	    			<tr>
+	    				MINE残課題対応No25 START -->
+	    				<!-- <td><a href="<?php echo $instInfoPath, "?id=", $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['DCF_DSF_INST_CD']; ?></a></td>
+	    				<td><?php echo $value['INST_NAME_KANJI']; ?></td> -->
+	    				<!-- MINE残課題対応No25 END -->
+	    				<!-- <td><?php if ($value['BLNG_SEC_NAME'] == '') {echo "　";} else{ echo $value['BLNG_SEC_NAME']; } ?></td>
+	    				<td><?php if ($value['UNIV_POST_NAME'] == '') {echo "　";} else{ echo $value['UNIV_POST_NAME']; } ?></td>
+	    				<td><?php if ($value['POST_NAME'] == '') {echo "　";} else{ echo $value['POST_NAME']; } ?></td> -->
+	    				<!-- MINE残課題対応No10 START -->
+	    				<!-- <td><?php if ($value['APLY_START_YMD'] == '') {echo "　";} else{ echo date('Y/m/d',strtotime($value['APLY_START_YMD'])); } ?></td>
+	    				<td><?php if ($value['INST_NAME_KANJI'] == '') {echo "　";} else{ echo "9999/99/99"; } ?></td> -->
+	    				<!-- MINE残課題対応No10 END -->
+	    			<!-- </tr>--> 
+					{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
+					{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd) != ''%}
+						<tr>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}</td>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.inst_name_kanji)}}</td>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.blng_sec_name)}}</td>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.univ_post_name)}}</td>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.post_name)}}</td>
+							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.aply_start_ymd)}}</td>
+							<td>9999/99/99</td>
+						</tr>
+					{% endif %}
+					{% endfor %}
+
+				<!-- <?php
+				}
+				foreach ($wrkplaceHisDt as $value) {
+					$dispHisBlankFlg = empty($value['INST_NAME_KANJI']);
+					// 現在の勤務先が存在し、ヒットした履歴にデータがなかった場合
+					if ($dispHisBlankFlg && !$dispBlankFlg) {
+						// 現在の勤務先だけ表示
+						break;
+					}
+				?> --> 
+				{% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
+				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd) != ''%}
+				<tr>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.inst_name_kanji)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.blng_sec_name)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.univ_post_name)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.post_name)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.aply_start_ymd)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.aply_end_ymd)}}</td>
+					</tr>
+				{% endif %}
+				{% endfor %}
+				    			<!-- <tr> -->
+	    				<!-- MINE残課題対応No25 START -->
+	    				<!-- <td><a href="<?php echo $instInfoPath, "?id=", $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['DCF_DSF_INST_CD']; ?></a></td>
+	    				<td><?php echo $value['INST_NAME_KANJI']; ?></a></td> -->
+	    				<!-- MINE残課題対応No25 END -->
+	    				<!-- <td><?php if ($value['BLNG_SEC_NAME'] == '') {echo "　";} else{ echo $value['BLNG_SEC_NAME']; } ?></td>
+	    				<td><?php if ($value['UNIV_POST_NAME'] == '') {echo "　";} else{ echo $value['UNIV_POST_NAME']; } ?></td>
+	    				<td><?php if ($value['POST_NAME'] == '') {echo "　";} else{ echo $value['POST_NAME']; } ?></td> -->
+	    				<!-- MINE残課題対応No10 START -->
+	    				<!-- <td><?php if ($value['APLY_START_YMD'] == '') {echo "　";} else{ echo date('Y/m/d',strtotime($value['APLY_START_YMD'])); } ?></td>
+	    				<td><?php if ($dispHisBlankFlg) { echo "　"; } elseif ($value['APLY_END_YMD'] == '') {echo "9999/99/99";} else{ echo date('Y/m/d',strtotime($value['APLY_END_YMD'])); } ?></td> -->
+	    				<!--MINE残課題対応No10 END  -->
+	    			<!-- </tr> -->
+				<!-- <?php
+				}
+
+				// メモリ解放
+				$docDt = null;
+				$trtDt = null;
+				$sosietyDt = null;
+				$spcialistDt = null;
+				$wrkplaceDt = null;
+				$wrkplaceHisDt = null;
+				?> -->
+			</tbody>
+		</table>
+	</div>
+	<!-- <div id="error" title="エラー">
+		<div style="float: left;width: 15%"><img class="ErrorImg" style="width: 50px;" src="/common/css/image/error.png"></div>
+		<div id="errorTxt" style="float: right; white-space: normal; width: 300px;"></div>
+	</div> -->
+	<!-- <?php
+	// DBエラーしていないか
+	if(!$isDBSuccess){
+		print "<script language=javascript>CreateDialog();</script>";
+		print "<script language=javascript>DisplayErrorDialog('$dbErrMsg');</script>";
+	}
+	?> -->
+</body>
+</html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 475578fa..2168aa3e 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -20,19 +20,17 @@
 
 <!--検索フォーム-->
 <body>
-		
-			<table class="docHeaderTable">
-				<tr>
-					<td class="docHeaderTd"><h1>医師検索一覧</h1></td>
-					<td class="docHeaderTdCenter docHeaderTdCenter">
-                        {% if ultmarc.is_batch_processing %}
-                        <div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
-                        {% endif %}
-					</td>
-					<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
-				</tr>
-			</table>
-		</h1>
+	<table class="docHeaderTable">
+		<tr>
+			<td class="docHeaderTd"><h1>医師検索一覧</h1></td>
+			<td class="docHeaderTdCenter docHeaderTdCenter">
+				{% if ultmarc.is_batch_processing %}
+				<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+				{% endif %}
+			</td>
+			<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
+		</tr>
+	</table>
 	<form class="_form" name="search" action="/ultmarc/docSearch" method="POST">
 		<table class="docSearchTableDivTwo">
 			<tbody>

From 91f47d4fa450cbc6bc614b49bc1010161c16f7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Wed, 7 Jun 2023 09:42:31 +0900
Subject: [PATCH 09/24] =?UTF-8?q?=E5=8C=BB=E5=B8=AB=E6=83=85=E5=A0=B1?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AF=E5=A4=A7=E4=BD=93=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |  53 ++-
 .../src/model/request/ultmarc_doctor.py       |  17 +
 .../view/ultmarc_doctor_info_view_model.py    |  17 +
 ecs/jskult-webapp/src/templates/docInfo.html  | 320 ++----------------
 .../src/templates/docSearch.html              |  21 +-
 5 files changed, 125 insertions(+), 303 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 399ca6e4..3037971f 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -6,7 +6,7 @@ from starlette import status
 
 from src.depends.services import get_service
 from src.model.internal.session import UserSession
-from src.model.request.ultmarc_doctor import UltmarcDoctorModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorModel, UltmarcDoctorInfoModel
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
 from src.services.ultmarc_view_service import UltmarcViewService
@@ -115,6 +115,57 @@ def ultmarc_doctor_info_view(
     ultmarc = ultmarc_service.info_ultmarc_doctor_view(id, session)
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
+    # DocId
+    ultmarc.DocId = id
+    # ページ総数（件数）
+    ultmarc.postCnt = 1
+    # ページ数（表示するページNo）
+    ultmarc.pageNum = 0
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'docInfo.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
+@router.post('/docInfo')
+def ultmarc_doctor_info_search(
+    request: Request,
+    ultmarc_doctor_form: Optional[UltmarcDoctorInfoModel] = Depends(UltmarcDoctorInfoModel.as_form),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
+    docId = ultmarc_doctor_form.docId.split(',')
+
+    # 医師情報の取得
+    ultmarc = ultmarc_service.info_ultmarc_doctor_view(docId[ultmarc_doctor_form.pageNum], session)
+    # バッチ起動判定の取得
+    ultmarc.is_batch_processing = is_batch_processing
+    # DocId
+    ultmarc.DocId = ultmarc_doctor_form.docId
+    # ページ総数（件数）
+    ultmarc.postCnt = len(docId)
+    # ページ数（表示するページNo）
+    ultmarc.pageNum = ultmarc_doctor_form.pageNum
 
     # セッション書き換え
     session.update(
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
index 5935c076..0633624e 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -49,3 +49,20 @@ class UltmarcDoctorModel(BaseModel):
             alma=ctrl_alma,
             grad_y=ctrl_grad_y
         )
+
+
+class UltmarcDoctorInfoModel(BaseModel):
+    docId: Optional[str]
+    pageNum: Optional[int]
+
+    @classmethod
+    def as_form(
+        cls,
+        docId: str = Form(None),
+        pageNum: str = Form(None)
+    ):
+
+        return cls(
+            docId=docId,
+            pageNum=int(pageNum)
+        )
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index 1cfbcf5f..993bea14 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -24,6 +24,9 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
     doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]
     doctor_wrkplace_his_data: Optional[list[UltmarcDoctorWrkplaceHisDBModel]]
+    DocId: Optional[str]
+    postCnt: Optional[int]
+    pageNum: Optional[int]
 
     def ultmarc_data_json_str(self):
         def date_handler(obj):
@@ -66,6 +69,20 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     def is_input_estab_y(self):
         return self.doctor_info_data.estab_y or ''
 
+    # 現在のページ（表示用）
+    def is_pageNum_view(self):
+        return self.pageNum + 1
+
+    # 前ボタン
+    def is_disabled_prev(self):
+        return 'disabled' if self.pageNum == 0 else ''
+
+    # 次ボタン
+    def is_disabled_next(self):
+        if self.pageNum == self.postCnt - 1:
+            return 'disabled'
+        return ''
+
     def is_input_birthday_fromat(self):
         return self._format_date_string(self.doctor_info_data.birthday)
 
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index e9214447..1202faee 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -14,169 +14,22 @@
             formBtDisabled();
 		}
 	</script>
+	<script>
+		$(function(){
+			// 前ページ遷移処理
+			$('#prev').click(function(){
+				$('#pageNum').val(Number($('#pageNum').val()) - 1);
+				$('#instInfo').submit();
+			});
+			// 次ページ遷移処理
+			$('#next').click(function(){
+				$('#pageNum').val(Number($('#pageNum').val()) + 1);
+				$('#instInfo').submit();
+			});
+		});
+	</script>
 </head>
 
-<!-- <?php
-// 検索一覧から表示したいものを配列に入れ直し -->
-<!-- if(isset($_GET['id'])){
-	$docId[0] = $_GET['id'];
-	$pageNum = 0; -->
-
-<!-- } else if(isset($_POST['next'])){
-	// ページ数を+1
-	$pageNum = $_POST['pageNum'] + 1;
-	$postCnt = count($_POST);
-	// 施設コード以外の情報を入れないために$postCnt - 2
-	for ($i = 0; $i < $postCnt - 2; $i++) {
-		$docId[$i] = array_shift($_POST);
-	}
-
-} else if (isset($_POST['prev'])) {
-	// ページ数を-1
-	$pageNum = $_POST['pageNum'] - 1;
-	$postCnt = count($_POST);
-	// 施設コード以外の情報を入れないために$postCnt - 2
-	for ($i = 0; $i < $postCnt - 2; $i++) {
-		$docId[$i] = array_shift($_POST);
-	}
-
-} else if(isset($_POST['detail'])){
-	$pageNum = 0;
-	$postCnt = count($_POST);
-	for ($i = 0; $i < $postCnt - 1; $i++) {
-		$docId[$i] = array_shift($_POST);
-	}
-} else{
-	header('Location: ' . $logoutPath);
-} -->
-
-<!-- $pageCnt = count($docId);
-$sqlCls = new sqlClass();
-$isDBSuccess = $sqlCls->dbConnection($dbs, $user, $pass, $docInfoPath, __LINE__);
-
-// データベース接続チェック
-if (!isset($isDBSuccess)) {
-	$isDBSuccess = true;
-	// 医師情報SQL
-	$sql = "
-	SELECT COM_DR.DCF_PCF_DR_CD, COM_DR.DR_NAME, COM_DR.DR_NAME_KANA, COM_SEX.SEX, COM_DR.BIRTHDAY, COM_ALMA.ALMA, COM_HOMETOWN.HOMETOWN, COM_DR.GRAD_Y, COM_DR.DRDAY_Y, COM_DR.ESTAB_Y
-	FROM ((COM_DR
-	LEFT JOIN COM_SEX ON COM_DR.SEX_CD = COM_SEX.SEX_CD)
-	LEFT JOIN COM_ALMA ON COM_DR.ALMA_CD = COM_ALMA.ALMA_CD)
-	LEFT JOIN COM_HOMETOWN ON COM_DR.HOMETOWN_CD = COM_HOMETOWN.HOMETOWN_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$docDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($docDt == false) {
-		$isDBSuccess = false;
-	}
-
-	// 診療科目SQL
-	$sql = "
-	SELECT TRT_COURSE_NAME FROM (COM_DR
-	LEFT JOIN COM_DR_TRT_COURSE ON COM_DR.DCF_PCF_DR_CD = COM_DR_TRT_COURSE.DCF_PCF_DR_CD)
-	LEFT JOIN COM_TRT_COURSE ON COM_DR_TRT_COURSE.TRT_COURSE_CD	= COM_TRT_COURSE.TRT_COURSE_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id
-	ORDER BY COM_TRT_COURSE.TRT_COURSE_CD;";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$trtDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($trtDt == false) {
-		$isDBSuccess = false;
-	}
-
-	// 学会SQL
-	$sql = "
-	SELECT COM_SOSIETY.SOSIETY_CD, COM_SOSIETY.SOSIETY_NAME
-	FROM (COM_DR
-	LEFT JOIN COM_DR_SOSIETY ON COM_DR.DCF_PCF_DR_CD = COM_DR_SOSIETY.DCF_PCF_DR_CD)
-	LEFT JOIN COM_SOSIETY ON COM_DR_SOSIETY.SOSIETY_CD = COM_SOSIETY.SOSIETY_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id
-	ORDER BY COM_SOSIETY.SOSIETY_CD;";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$sosietyDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($sosietyDt == false) {
-		$isDBSuccess = false;
-	}
-
-	// 専門医SQL
-	$sql = "
-	SELECT COM_SPECIALIST_LICENSE.SPECIALIST_CD, COM_SPECIALIST_LICENSE.SPECIALIST_LICENSE_NAME
-	FROM (COM_DR
-	LEFT JOIN COM_SP_FIELD ON COM_DR.DCF_PCF_DR_CD = COM_SP_FIELD.DCF_PCF_DR_CD)
-	LEFT JOIN COM_SPECIALIST_LICENSE ON COM_SP_FIELD.SPECIALIST_CD = COM_SPECIALIST_LICENSE.SPECIALIST_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id
-	ORDER BY COM_SPECIALIST_LICENSE.SPECIALIST_CD;";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$spcialistDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($spcialistDt == false) {
-		$isDBSuccess = false;
-	}
-
-	// 勤務先SQL
-	$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.APLY_START_YMD
-	FROM ((((COM_DR
-	LEFT JOIN COM_DR_WRKPLACE ON COM_DR.DCF_PCF_DR_CD = COM_DR_WRKPLACE.DCF_PCF_DR_CD)
-	LEFT JOIN COM_INST ON COM_DR_WRKPLACE.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
-	LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
-	LEFT JOIN COM_POST AS UNIV_POST ON COM_DR_WRKPLACE.IDENTITY_CD = UNIV_POST.POST_CD)
-	LEFT JOIN COM_POST AS POST ON COM_DR_WRKPLACE.POST_CD = POST.POST_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id
-	ORDER BY COM_DR_WRKPLACE.APLY_START_YMD DESC;";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$wrkplaceDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($wrkplaceDt == false) {
-		$isDBSuccess = false;
-	}
-
-	// 勤務先履歴SQL
-	$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, 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)
-	LEFT JOIN COM_INST ON COM_DR_WRKPLACE_HIS.DCF_DSF_INST_CD = COM_INST.DCF_DSF_INST_CD)
-	LEFT JOIN COM_BLNG_SEC ON COM_DR_WRKPLACE_HIS.BLNG_SEC_CD = COM_BLNG_SEC.BLNG_SEC_CD)
-	LEFT JOIN COM_POST AS UNIV_POST ON COM_DR_WRKPLACE_HIS.IDENTITY_CD = UNIV_POST.POST_CD)
-	LEFT JOIN COM_POST AS POST ON COM_DR_WRKPLACE_HIS.POST_CD = POST.POST_CD
-	WHERE COM_DR.DCF_PCF_DR_CD = :id
-	ORDER BY COM_DR_WRKPLACE_HIS.APLY_END_YMD DESC, COM_DR_WRKPLACE_HIS.APLY_START_YMD DESC;";
-	$val[':id'] = $docId[$pageNum];
-	$info = array($sql, $val);
-	$wrkplaceHisDt = $sqlCls->dbSelect($info, $docInfoPath, __LINE__);
-	if ($wrkplaceHisDt == false) {
-		$isDBSuccess = false;
-	}
-
-	$val = null;
-	$info = null;
-	$sqlCls->dbExit();
-	$sqlCls =null;
-} else {
-	$docDt = array(array(
-		'DCF_PCF_DR_CD' => '',
-		'DR_NAME' => '',
-		'DR_NAME_KANA' => '',
-		'SEX' => '',
-		'BIRTHDAY' => '',
-		'ALMA' => '',
-		'HOMETOWN' =>'',
-		'GRAD_Y' => '',
-		'DRDAY_Y' => '',
-		'ESTAB_Y' =>'',
-	));
-	$trtDt = array();
-	$sosietyDt = array(array('SOSIETY_CD' => '　', 'SOSIETY_NAME' => '　'));
-	$spcialistDt = array(array('SPECIALIST_CD' => '　', 'SPECIALIST_LICENSE_NAME' => '　'));
-	$wrkplaceDt = array(array('DCF_DSF_INST_CD' => '', 'INST_NAME_KANJI' => '', 'BLNG_SEC_NAME' => '', 'UNIV_POST_NAME' => '', 'POST_NAME' => '', 'APLY_START_YMD' => ''));
-	$wrkplaceHisDt = array(array('DCF_DSF_INST_CD' => '', 'INST_NAME_KANJI' => '', 'BLNG_SEC_NAME' => '', 'UNIV_POST_NAME' => '', 'POST_NAME' => '', 'APLY_START_YMD' => ''));
-}
-	?> -->
-
 <body>
 	<table class="docHeaderTable">
 		<tr>
@@ -193,30 +46,17 @@ if (!isset($isDBSuccess)) {
 	<!-- 上部のボタン -->
 	<table class="instHeaderTable">
 		<tr>
-			<form name="instInfo" method="post" action="/ultmarc/docInfo">
-				<!-- <?php
-				for ($i = 0; $i < count($docId); $i++) {
-				?> -->
-					<input type="hidden" name="ctrl_docId" value="">
-					<!-- <?php echo $i ?> -->
-					<!-- <?php echo $docId[$i] ?> -->
-				<!-- <?php
-				}
-				?> -->
-				<input type="hidden" name="pageNum" value="">
-				<!-- <?php echo $pageNum ?> -->
+			<form id="instInfo" name="instInfo" method="post" action="/ultmarc/docInfo">
+				<input type="hidden" name="docId" value="{{ultmarc.DocId}}">
+				<input type="hidden" name="pageNum" id="pageNum" value="{{ultmarc.pageNum}}">
 				<td class="instHeaderTd">
-					<input type="submit" name="prev" value="前" class="transitionBt" >
-					<!-- <?php if ($pageNum == 0) {echo "disabled";	} ?> -->
+					<input type="button" name="prev" id="prev"  value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
 				</td>
 				<td class="instHeaderTd">
-				<!-- <?php
-					echo $pageNum + 1 , '／', $pageCnt;
-				?> -->
+					{{ultmarc.is_pageNum_view()}}／{{ultmarc.postCnt}}
 				</td>
 				<td class="instHeaderTd">
-					<input type="submit" name="next" value="次" class="transitionBt" >
-					<!-- <?php if ($pageNum == $pageCnt - 1) {echo "disabled"; } ?> -->
+					<input type="button" name="next" id="next"  value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
 				</td>
 			</form>
 			<form name="instSearch" method="get" action="/ultmarc/docSearch">
@@ -226,9 +66,7 @@ if (!isset($isDBSuccess)) {
 			</form>
 		</tr>
 	</table>
-	<!-- <?php
-	foreach ($docDt as $value) {
-	?> -->
+
 	<table class="docInfoTable">
 		<tbody>
 			<tr>
@@ -259,37 +97,16 @@ if (!isset($isDBSuccess)) {
 					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_estab_y()}}">
 				</td>
 			</tr>
-		<!-- <?php
-		}
 
-		?> -->
 			<tr>
 				<td colspan="6" class="docInfoTd">
 					診療科目:
-				<!-- <?php
-					{{ultmarc.trt_coursed_data.trt_course_name}}
-
-				$i = 0;
-				foreach ($trtDt as $value) {
-				?> -->
 				{% for trt_coursed_data in ultmarc.trt_coursed_data %}
-				<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="{{trt_coursed_data.trt_course_name}}">
+					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="{{trt_coursed_data.trt_course_name}}">
 				{% endfor %}
-
-					
-					<!-- <?php echo $value['TRT_COURSE_NAME'] ?>
-				<?php
-					$i++;
-				}
-				while($i < 5){
-				?> -->
 				{% for i in range(5-ultmarc.is_input_trt_course_data_size())%}
 					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="">
 				{% endfor %}
-				<!-- <?php
-					$i++;
-				}
-				?> -->
 				</td>
 			</tr>
 		</tbody>
@@ -309,18 +126,6 @@ if (!isset($isDBSuccess)) {
 								</tr>
 							</thead>
 							<tbody>
-								<!-- <?php
-								foreach ($sosietyDt as $value) {
-								?>
-								
-									<tr>
-										<td><?php if ($value['SOSIETY_CD'] == '') {echo "　";} else{ echo $value['SOSIETY_CD']; } ?></td>
-										<td><?php if ($value['SOSIETY_NAME'] == '') {echo "　";} else{ echo $value['SOSIETY_NAME']; } ?></td>
-									</tr>
-								
-								<?php
-								}
-								?> -->
 								{% for sosiety_data in ultmarc.sosiety_data %}
 									<tr>
 										<td>{{ultmarc.is_data_string_empty_fromat(sosiety_data.sosiety_cd)}}</td>
@@ -348,16 +153,6 @@ if (!isset($isDBSuccess)) {
 										<td>{{ultmarc.is_data_string_empty_fromat(specialist_license_data.specialist_license_name)}}</td>
 									</tr>
 								{% endfor %}
-								<!-- <?php
-								foreach ($spcialistDt as $value) {
-								?>
-									<tr>
-										<td><?php if ($value['SPECIALIST_CD'] == '') {echo "　";} else{ echo $value['SPECIALIST_CD']; } ?></td>
-										<td><?php if ($value['SPECIALIST_LICENSE_NAME'] == '') {echo "　";} else{ echo $value['SPECIALIST_LICENSE_NAME']; } ?></td>
-									</tr>
-								<?php
-								}
-								?> -->
 							</tbody>
 						</table>
 					</div>
@@ -371,42 +166,16 @@ if (!isset($isDBSuccess)) {
     	<table class="tablesorter wrkplaceTable" _fixedhead='rows:1; cols:0; border-color:gray; border-width:2px;'>
 			<thead>
 				<tr>
-					<!-- MINE残課題対応No25 START -->
 					<th>ULT施設コード</th>
-					<!-- MINE残課題対応No25 END -->
 					<th>勤務先略名</th>
 					<th>所属部科名</th>
 					<th>役職名</th>
 					<th>職位</th>
-    				<!-- MINE残課題対応No10 START -->
 					<th>開始年月日</th>
 					<th>終了年月日</th>
-    				<!-- MINE残課題対応No10 END -->
 				</tr>
 			</thead>
 			<tbody>
-				<!-- <?php
-				$dispBlankFlg = false;
-				foreach ($wrkplaceDt as $value) {
-					// ヒットしたデータがなかった場合
-					if (empty($value['INST_NAME_KANJI'])) {
-						$dispBlankFlg = true;
-						break;
-					}
-				?>
-	    			<tr>
-	    				MINE残課題対応No25 START -->
-	    				<!-- <td><a href="<?php echo $instInfoPath, "?id=", $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['DCF_DSF_INST_CD']; ?></a></td>
-	    				<td><?php echo $value['INST_NAME_KANJI']; ?></td> -->
-	    				<!-- MINE残課題対応No25 END -->
-	    				<!-- <td><?php if ($value['BLNG_SEC_NAME'] == '') {echo "　";} else{ echo $value['BLNG_SEC_NAME']; } ?></td>
-	    				<td><?php if ($value['UNIV_POST_NAME'] == '') {echo "　";} else{ echo $value['UNIV_POST_NAME']; } ?></td>
-	    				<td><?php if ($value['POST_NAME'] == '') {echo "　";} else{ echo $value['POST_NAME']; } ?></td> -->
-	    				<!-- MINE残課題対応No10 START -->
-	    				<!-- <td><?php if ($value['APLY_START_YMD'] == '') {echo "　";} else{ echo date('Y/m/d',strtotime($value['APLY_START_YMD'])); } ?></td>
-	    				<td><?php if ($value['INST_NAME_KANJI'] == '') {echo "　";} else{ echo "9999/99/99"; } ?></td> -->
-	    				<!-- MINE残課題対応No10 END -->
-	    			<!-- </tr>--> 
 					{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
 					{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd) != ''%}
 						<tr>
@@ -421,16 +190,6 @@ if (!isset($isDBSuccess)) {
 					{% endif %}
 					{% endfor %}
 
-				<!-- <?php
-				}
-				foreach ($wrkplaceHisDt as $value) {
-					$dispHisBlankFlg = empty($value['INST_NAME_KANJI']);
-					// 現在の勤務先が存在し、ヒットした履歴にデータがなかった場合
-					if ($dispHisBlankFlg && !$dispBlankFlg) {
-						// 現在の勤務先だけ表示
-						break;
-					}
-				?> --> 
 				{% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
 				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd) != ''%}
 				<tr>
@@ -444,43 +203,10 @@ if (!isset($isDBSuccess)) {
 					</tr>
 				{% endif %}
 				{% endfor %}
-				    			<!-- <tr> -->
-	    				<!-- MINE残課題対応No25 START -->
-	    				<!-- <td><a href="<?php echo $instInfoPath, "?id=", $value['DCF_DSF_INST_CD'] ?>"><?php echo $value['DCF_DSF_INST_CD']; ?></a></td>
-	    				<td><?php echo $value['INST_NAME_KANJI']; ?></a></td> -->
-	    				<!-- MINE残課題対応No25 END -->
-	    				<!-- <td><?php if ($value['BLNG_SEC_NAME'] == '') {echo "　";} else{ echo $value['BLNG_SEC_NAME']; } ?></td>
-	    				<td><?php if ($value['UNIV_POST_NAME'] == '') {echo "　";} else{ echo $value['UNIV_POST_NAME']; } ?></td>
-	    				<td><?php if ($value['POST_NAME'] == '') {echo "　";} else{ echo $value['POST_NAME']; } ?></td> -->
-	    				<!-- MINE残課題対応No10 START -->
-	    				<!-- <td><?php if ($value['APLY_START_YMD'] == '') {echo "　";} else{ echo date('Y/m/d',strtotime($value['APLY_START_YMD'])); } ?></td>
-	    				<td><?php if ($dispHisBlankFlg) { echo "　"; } elseif ($value['APLY_END_YMD'] == '') {echo "9999/99/99";} else{ echo date('Y/m/d',strtotime($value['APLY_END_YMD'])); } ?></td> -->
-	    				<!--MINE残課題対応No10 END  -->
-	    			<!-- </tr> -->
-				<!-- <?php
-				}
 
-				// メモリ解放
-				$docDt = null;
-				$trtDt = null;
-				$sosietyDt = null;
-				$spcialistDt = null;
-				$wrkplaceDt = null;
-				$wrkplaceHisDt = null;
-				?> -->
 			</tbody>
 		</table>
 	</div>
-	<!-- <div id="error" title="エラー">
-		<div style="float: left;width: 15%"><img class="ErrorImg" style="width: 50px;" src="/common/css/image/error.png"></div>
-		<div id="errorTxt" style="float: right; white-space: normal; width: 300px;"></div>
-	</div> -->
-	<!-- <?php
-	// DBエラーしていないか
-	if(!$isDBSuccess){
-		print "<script language=javascript>CreateDialog();</script>";
-		print "<script language=javascript>DisplayErrorDialog('$dbErrMsg');</script>";
-	}
-	?> -->
+
 </body>
 </html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 2168aa3e..c3168212 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -31,7 +31,7 @@
 			<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
 		</tr>
 	</table>
-	<form class="_form" name="search" action="/ultmarc/docSearch" method="POST">
+	<form id="doctor_search" class="_form" name="search" action="/ultmarc/docSearch" method="POST">
 		<table class="docSearchTableDivTwo">
 			<tbody>
 				<tr>
@@ -113,10 +113,11 @@
 	</form>
 	
 	<!--検索結果-->
-	<form class="_form" name="result" action="/ultmarc/docSearch" method="POST">
+	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListPocessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
-
+		<input type="hidden" name="docId" id="docId" value="">
+		<input type="hidden" name="pageNum" value="0">
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -142,7 +143,7 @@
             
 		</div>
 		<!--操作ボタン-->
-		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報">
+		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報" >
 	</form>
 
 	<script type="text/javascript">
@@ -197,7 +198,7 @@
 				return  `
 				<tr class="result_data">
 					<td><div class="checkNum">
-						<input type="checkbox" class="checkbox selected" name="data${index+1}"  onclick="resultBtDisablead()" 
+						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()" 
 						value=${data['dcf_pcf_dr_cd']}>
 					</div></td>
 					${td}
@@ -206,6 +207,16 @@
 				
 			})
 		}
+
+		// 配列パラメータを加工にする
+		function CheckBoxListPocessing()
+		{
+			var vals = []; // 配列を定義
+			$('input[name="data"]:checked').each(function() {
+				vals.push( $(this).val() ); // 配列に値を追加
+			});
+			$("#docId").val(vals.join(','));
+		}
 </script>
 </body>
 </html>
\ No newline at end of file

From 227f79932c8a66a82ea5286d33a7291733e174da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Thu, 8 Jun 2023 10:21:24 +0900
Subject: [PATCH 10/24] =?UTF-8?q?=E6=96=BD=E8=A8=AD=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=EF=BC=88=E5=AE=9F=E8=A3=85=E5=AE=8C=E4=BA=86?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |  78 ++++++-
 .../src/model/db/inst_div_master.py           |   8 +
 .../src/model/db/ultmarc_inst.py              |  18 ++
 .../src/model/request/ultmarc_inst.py         |  61 +++++
 .../src/model/view/ultmarc_inst_view_model.py | 103 +++++++++
 .../repositories/inst_master_repository.py    |  29 +++
 .../repositories/ultmarc_inst_repository.py   | 108 +++++++++
 .../src/services/ultmarc_view_service.py      |  32 ++-
 ecs/jskult-webapp/src/static/css/ultStyle.css |   2 +-
 .../src/templates/instSearch.html             | 212 ++++++++++++++++++
 ecs/jskult-webapp/src/templates/menu.html     |   2 +-
 11 files changed, 649 insertions(+), 4 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/db/inst_div_master.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_inst.py
 create mode 100644 ecs/jskult-webapp/src/model/request/ultmarc_inst.py
 create mode 100644 ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
 create mode 100644 ecs/jskult-webapp/src/repositories/inst_master_repository.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
 create mode 100644 ecs/jskult-webapp/src/templates/instSearch.html

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 3037971f..f4747bc8 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -7,6 +7,7 @@ from starlette import status
 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
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
 from src.services.ultmarc_view_service import UltmarcViewService
@@ -22,6 +23,81 @@ router.route_class = AuthenticatedRoute
 #########################
 
 
+@router.get('/instSearch')
+def ultmarc_inst_view(
+    request: Request,
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
+    # 検索項目の取得（都道府県・施設区分）
+    ultmarc = ultmarc_service.ultmarc_inst_view(session)
+    ultmarc.is_batch_processing = is_batch_processing
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'instSearch.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
+@router.post('/instSearch')
+def search_inst(
+    request: Request,
+    ultmarc_inst_form: Optional[UltmarcInstModel] = Depends(UltmarcInstModel.as_form),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    # is_batch_processing = batch_status_service.is_batch_processing()
+    # if batch_status_service.is_batch_processing():
+    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
+
+    # 施設データを検索
+    ultmarc_inst_data = ultmarc_service.search_inst_data(ultmarc_inst_form)
+
+    # 検索項目の取得（都道府県・施設区分）
+    ultmarc = ultmarc_service.ultmarc_inst_view(session)
+    ultmarc.is_batch_processing = batch_status_service.is_batch_processing()
+    ultmarc.inst_data = ultmarc_inst_data
+    ultmarc.form_data = ultmarc_inst_form
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'instSearch.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
 @router.get('/docSearch')
 def ultmarc_doctor_view(
     request: Request,
@@ -35,7 +111,7 @@ def ultmarc_doctor_view(
     # if batch_status_service.is_batch_processing():
     #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
 
-    # # 検索項目の取得
+    # 検索項目の取得(都道府県)
     ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
     ultmarc.is_batch_processing = is_batch_processing
 
diff --git a/ecs/jskult-webapp/src/model/db/inst_div_master.py b/ecs/jskult-webapp/src/model/db/inst_div_master.py
new file mode 100644
index 00000000..38ec7b70
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/inst_div_master.py
@@ -0,0 +1,8 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+
+
+class InstDivMasterModel(BaseDBModel):
+    inst_div_cd: Optional[str]
+    inst_div_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst.py
new file mode 100644
index 00000000..14830582
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst.py
@@ -0,0 +1,18 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcInstDBModel(BaseDBModel):
+    dcf_dsf_inst_cd: Optional[str]
+    abolish_ymd: Optional[str]
+    delete_sche_reason_cd: Optional[str]
+    form_inst_name_kanji: Optional[str]
+    inst_addr: Optional[str]
+    postal_number: Optional[str]
+    inst_phone_number: Optional[str]
+    inst_div_name: Optional[str]
+    hp_assrt_name: Optional[str]
+    prefc_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
new file mode 100644
index 00000000..f7919612
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -0,0 +1,61 @@
+from typing import Optional
+
+from fastapi import Form
+from pydantic import BaseModel
+
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcInstModel(BaseModel):
+    dcf_dsf_inst_cd: Optional[str]
+    inst_div_cd: Optional[str]
+    form_inst_name_kanji: Optional[str]
+    form_inst_name_kana: Optional[str]
+    postal_number: Optional[str]
+    inst_phone_number: Optional[str]
+    prefc_cd: Optional[str]
+    delFlg: Optional[str]
+    inst_addr: Optional[str]
+
+    @classmethod
+    def as_form(
+        cls,
+        ctrl_dcf_dsf_inst_cd: str = Form(None),
+        ctrl_inst_div_cd: str = Form(None),
+        ctrl_form_inst_name_kanji: str = Form(None),
+        ctrl_form_inst_name_kana: str = Form(None),
+        ctrl_postal_number: str = Form(None),
+        ctrl_inst_phone_number: str = Form(None),
+        ctrl_prefc_cd: str = Form(None),
+        ctrl_delFlg: str = Form(None),
+        ctrl_inst_addr: str = Form(None)
+    ):
+        return cls(
+            dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd,
+            inst_div_cd=ctrl_inst_div_cd,
+            form_inst_name_kanji=ctrl_form_inst_name_kanji,
+            form_inst_name_kana=ctrl_form_inst_name_kana,
+            postal_number=ctrl_postal_number,
+            inst_phone_number=ctrl_inst_phone_number,
+            prefc_cd=ctrl_prefc_cd,
+            delFlg=ctrl_delFlg,
+            inst_addr=ctrl_inst_addr
+        )
+
+
+class UltmarcInstInfoModel(BaseModel):
+    docId: Optional[str]
+    pageNum: Optional[int]
+
+    @classmethod
+    def as_form(
+        cls,
+        docId: str = Form(None),
+        pageNum: str = Form(None)
+    ):
+
+        return cls(
+            docId=docId,
+            pageNum=int(pageNum)
+        )
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
new file mode 100644
index 00000000..a0b5107c
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -0,0 +1,103 @@
+import json
+from datetime import datetime
+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.view.bio_disp_model import BisDisplayModel
+from src.system_var import environment
+
+
+class UltmarcInstViewModel(BaseModel):
+    subtitle: str = '施設検索一覧'
+    is_batch_processing: Optional[bool]
+    prefc_models: list[PrefcMasterModel]
+    inst_div_models: list[InstDivMasterModel]
+    inst_data: Optional[list[BisDisplayModel]] = []
+    form_data: Optional[UltmarcInstModel]
+
+    def ultmarc_data_json_str(self):
+        def date_handler(obj):
+            return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+        return json.dumps([model.dict() for model in self.inst_data], ensure_ascii=False, default=date_handler)
+
+    # ULT施設コード
+    def is_input_dcf_dsf_inst_cdd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.dcf_dsf_inst_cd or ''
+
+    # 施設区分
+    def is_selected_inst_div_cd(self, selected_inst_div_cd):
+        if not self.is_form_submitted():
+            return ''
+        return self._selected_value(self.form_data.inst_div_cd, selected_inst_div_cd)
+
+    # ULT施設名(漢字)
+    def is_input_form_inst_name_kanji(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.form_inst_name_kanji or ''
+
+    # ULT施設名(かな・カナ)
+    def is_input_form_inst_name_kana(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.form_inst_name_kana or ''
+
+    # 郵便番号
+    def is_input_postal_number(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.postal_number or ''
+
+    # 電話番号
+    def is_input_inst_phone_number(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.inst_phone_number or ''
+
+    # 削除施設表示
+    def is_checked_delFlg(self):
+        if not self.is_form_submitted():
+            return ''
+        return self._checked_value(self.form_data.delFlg)
+
+    # ULT施設住所
+    def is_input_inst_addr(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.inst_addr or ''
+
+    # 勤務先都道府県
+    def is_selected_prefc_cd(self, selected_prefc_cd):
+        if not self.is_form_submitted():
+            return ''
+        return self._selected_value(self.form_data.prefc_cd, selected_prefc_cd)
+
+    def disabled_button(self):
+        return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
+
+    def is_form_submitted(self):
+        return self.form_data is not None
+
+    def is_data_empty(self):
+        return len(self.doctor_data) == 0
+
+    def is_data_overflow_max_length(self):
+        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+
+    def _format_date_string(self, date_string):
+        if date_string is None:
+            return ''
+        date = datetime.strptime(date_string, '%Y%m%d')
+        return date.strftime('%Y/%m/%d')
+
+    def _selected_value(self, form_value: str, current_value: str):
+        return 'selected' if form_value == current_value else ''
+
+    def _checked_value(self, form_value: str):
+        return 'checked' if form_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/inst_master_repository.py b/ecs/jskult-webapp/src/repositories/inst_master_repository.py
new file mode 100644
index 00000000..d4b18505
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/inst_master_repository.py
@@ -0,0 +1,29 @@
+from src.model.db.inst_div_master import InstDivMasterModel
+from src.repositories.base_repository import BaseRepository
+
+
+class InstDivMasterRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        SELECT
+            DISTINCT com_inst_div.inst_div_cd AS inst_div_cd,
+            com_inst_div.inst_div_name AS inst_div_name
+        FROM src05.com_inst
+        JOIN src05.com_inst_div on com_inst.inst_div_cd = com_inst_div.inst_div_cd
+        ORDER BY com_inst_div.inst_div_cd
+    """
+
+    def fetch_all(self) -> list[InstDivMasterModel]:
+        try:
+            self._database.connect()
+            result = self._database.execute_select(self.FETCH_SQL)
+            result_data = [res for res in result]
+            models = [InstDivMasterModel(**r) for r in result_data]
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] getOroshiData DB Error. ")
+            print(f"[ERROR] ErrorMessage: {e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
new file mode 100644
index 00000000..438c429d
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -0,0 +1,108 @@
+from src.db import sql_condition as condition
+from src.db.sql_condition import SQLCondition
+from src.model.db.ultmarc_inst import UltmarcInstDBModel
+from src.model.request.ultmarc_inst import UltmarcInstModel
+from src.repositories.base_repository import BaseRepository
+from src.util.string_util import is_not_empty
+
+
+class UltmarcInstRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        SELECT
+        dcf_dsf_inst_cd,
+        abolish_ymd,
+        delete_sche_reason_cd,
+        form_inst_name_kanji,
+        inst_addr,
+        postal_number,
+        inst_phone_number,
+        inst_div_name,
+        hp_assrt_name,
+        prefc_name
+        FROM src05.com_inst
+        LEFT JOIN src05.mst_prefc ON com_inst.prefc_cd = mst_prefc.prefc_cd
+        LEFT JOIN src05.com_inst_div ON com_inst.inst_div_cd = com_inst_div.inst_div_cd
+        LEFT JOIN src05.com_hp_assrt ON com_inst.hp_assrt_cd = com_hp_assrt.hp_assrt_cd
+        WHERE {where_clause}
+        ORDER BY dcf_dsf_inst_cd
+    \
+    """
+
+    def fetch_many(self, parameter: UltmarcInstModel) -> list[UltmarcInstDBModel]:
+        try:
+            self._database.connect()
+            # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
+            clone_parameter = UltmarcInstModel(**parameter.dict())
+            where_clause = self.__build_condition(clone_parameter)
+            query = self.FETCH_SQL.format(where_clause=where_clause)
+            result = self._database.execute_select(query, clone_parameter.dict())
+            models = [UltmarcInstDBModel(**r) for r in result]
+
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
+
+    def __build_condition(self, parameter: UltmarcInstModel):
+        where_clauses: list[SQLCondition] = []
+
+        # ULT施設コード
+        if is_not_empty(parameter.dcf_dsf_inst_cd):
+            # 部分一致検索
+            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'))
+
+        # 施設区分
+        if is_not_empty(parameter.inst_div_cd):
+            where_clauses.append(SQLCondition('com_inst.inst_div_cd', condition.EQ, 'inst_div_cd'))
+
+        # ULT施設名(漢字)
+        if is_not_empty(parameter.form_inst_name_kanji):
+            # 部分一致検索
+            parameter.form_inst_name_kanji = f'%{parameter.form_inst_name_kanji}%'
+            where_clauses.append(SQLCondition('form_inst_name_kanji', condition.LIKE, 'form_inst_name_kanji'))
+
+        # ULT施設名(カナ)
+        if is_not_empty(parameter.form_inst_name_kana):
+            # 部分一致検索
+            parameter.form_inst_name_kana = f'%{parameter.form_inst_name_kana}%'
+            where_clauses.append(SQLCondition('form_inst_name_kana', condition.LIKE, 'form_inst_name_kana'))
+
+        # 郵便番号
+        if is_not_empty(parameter.postal_number):
+            # 前方一致検索
+            parameter.postal_number = f'{parameter.postal_number}%'
+            where_clauses.append(SQLCondition('postal_number', condition.LIKE, 'postal_number'))
+
+        # 電話番号
+        if is_not_empty(parameter.inst_phone_number):
+            # 前方一致検索
+            parameter.inst_phone_number = f'{parameter.inst_phone_number}%'
+            where_clauses.append(SQLCondition('inst_phone_number', condition.LIKE, 'inst_phone_number'))
+
+        # 勤務先都道府県
+        if is_not_empty(parameter.prefc_cd):
+            where_clauses.append(SQLCondition('com_inst.prefc_cd', condition.EQ, 'prefc_cd'))
+
+        # ULT施設住所
+        if is_not_empty(parameter.inst_addr):
+            # 部分一致検索
+            parameter.inst_addr = f'%{parameter.inst_addr}%'
+            where_clauses.append(SQLCondition('inst_addr', condition.LIKE, 'inst_addr'))
+
+        # 削除表示フラグ
+        if is_not_empty(parameter.delFlg):
+            # 論理和での検索
+            where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
+
+        # 検索条件が入力されていない場合
+        if not where_clauses:
+            where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
+
+        where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
+
+        return where_clauses_str
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 1b207c5e..65cc57a0 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -8,10 +8,14 @@ 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_view_model import UltmarcDoctorViewModel
+from src.model.view.ultmarc_inst_view_model import UltmarcInstViewModel
 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.ultmarc_doctor_repository import UltmarcDoctorRepository
 from src.repositories.ultmarc_trt_course_repository import UltmarcTrtCourseRepository
 from src.repositories.ultmarc_sosiety_repository import UltmarcSosietyRepository
@@ -26,6 +30,8 @@ class UltmarcViewService(BaseService):
     REPOSITORIES = {
         'ultmarc_doctor_repository': UltmarcDoctorRepository,
         'prefc_repository': PrefcMasterRepository,
+        'inst_div_repository': InstDivMasterRepository,
+        'ultmarc_inst_repository': UltmarcInstRepository,
         'ultmarc_trt_course_repository': UltmarcTrtCourseRepository,
         'ultmarc_sosiety_repository': UltmarcSosietyRepository,
         'ultmarc_doctor_wrkplace_repository': UltmarcDoctorWrkplaceRepository,
@@ -35,6 +41,8 @@ class UltmarcViewService(BaseService):
 
     ultmarc_doctor_repository: UltmarcDoctorRepository
     prefc_repository: PrefcMasterRepository
+    inst_div_repository: InstDivMasterRepository
+    ultmarc_inst_repository: UltmarcInstRepository
     ultmarc_trt_course_repository: UltmarcTrtCourseRepository
     ultmarc_sosiety_repository: UltmarcSosietyRepository
     ultmarc_doctor_wrkplace_repository: UltmarcDoctorWrkplaceRepository
@@ -45,6 +53,8 @@ class UltmarcViewService(BaseService):
         super().__init__(repositories, clients)
         self.ultmarc_doctor_repository = repositories['ultmarc_doctor_repository']
         self.prefc_repository = repositories['prefc_repository']
+        self.inst_div_repository = repositories['inst_div_repository']
+        self.ultmarc_inst_repository = repositories['ultmarc_inst_repository']
         self.ultmarc_trt_course_repository = repositories['ultmarc_trt_course_repository']
         self.ultmarc_sosiety_repository = repositories['ultmarc_sosiety_repository']
         self.ultmarc_doctor_wrkplace_repository = repositories['ultmarc_doctor_wrkplace_repository']
@@ -55,7 +65,7 @@ class UltmarcViewService(BaseService):
         self,
         session: UserSession
     ) -> UltmarcDoctorViewModel:
-        # # 都道府県リストを取得
+        # 都道府県リストを取得
         prefcs = self.prefc_repository.fetch_all()
 
         ultmarc = UltmarcDoctorViewModel(
@@ -63,6 +73,26 @@ class UltmarcViewService(BaseService):
         )
         return ultmarc
 
+    def ultmarc_inst_view(
+        self,
+        session: UserSession
+    ) -> UltmarcInstViewModel:
+        # 都道府県リストを取得
+        prefcs = self.prefc_repository.fetch_all()
+        # 施設区分リストを取得
+        inst_div = self.inst_div_repository.fetch_all()
+
+        ultmarc = UltmarcInstViewModel(
+            prefc_models=prefcs,
+            inst_div_models=inst_div
+        )
+        return ultmarc
+
+    def search_inst_data(self, search_params: UltmarcInstModel):
+        # 施設データを検索
+        ultmarc_inst_data = self.ultmarc_inst_repository.fetch_many(parameter=search_params)
+        return ultmarc_inst_data
+
     def search_doctor_data(self, search_params: UltmarcDoctorModel):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
diff --git a/ecs/jskult-webapp/src/static/css/ultStyle.css b/ecs/jskult-webapp/src/static/css/ultStyle.css
index 3f1850d0..8d018b01 100644
--- a/ecs/jskult-webapp/src/static/css/ultStyle.css
+++ b/ecs/jskult-webapp/src/static/css/ultStyle.css
@@ -134,7 +134,7 @@ table{
 }
 
 .instSearchButchMsg{
-	font-size: 80%;
+	/* font-size: 80%; */
 	color: red;
 }
 
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
new file mode 100644
index 00000000..92db85ae
--- /dev/null
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -0,0 +1,212 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    {% with subtitle = ultmarc.subtitle %}
+    {% include '_header.html' %}
+    {% endwith  %}
+    <link rel="stylesheet" href="/static/css/ultStyle.css">
+
+	<script type="text/javascript">
+		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
+
+		window.onload = function(){
+            // 見出し固定初期化
+            FixedMidashi.create();
+            // ボタン、テキストボックス初期化
+            formBtDisabled();
+		}
+	</script>
+</head>
+	
+<!--検索フォーム-->
+<body>
+	<!-- タイトルと上部ボタン -->
+		<table class="instSearchHeaderTable">
+			<tr>
+				<td class="instSearchHeaderTd"><h1>施設検索一覧</h1></td>
+				<td class="instSearchHeaderTdCenter instSearchHeaderTdCenter">
+                    {% if ultmarc.is_batch_processing %}
+                        <div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+                    {% endif %}
+				</td>
+				<td class="instSearchHeaderTd instSearchHeaderTdRight"><button class="instSearchHeader_bt" onclick="backToMenu()">メニューへ</button></td>
+			</tr>
+		</table>
+	<!-- 入力フォーム -->
+	<form class="_form" name="search" action="/ultmarc/instSearch" method="POST">
+		<table class="search_table">
+			<tbody>
+				<tr>
+					<td>ULT施設コード：</td>
+					<td class="search_tb leftSearch_tb">
+						<input class="text search_textbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
+                        value="{{ultmarc.is_input_dcf_dsf_inst_cdd()}}" oninput="formBtDisabled()">
+					</td>
+					<td>施設区分：</td>
+					<td class="search_tb">
+						<!-- 施設区分のドロップダウン -->
+						<select class="text search_dropdown" name="ctrl_inst_div_cd" onchange="formBtDisabled()">
+							<option value=""></option>
+                            {% for inst_div in ultmarc.inst_div_models %}
+                            <option value="{{inst_div['inst_div_cd']}}" {{ultmarc.is_selected_inst_div_cd(inst_div['inst_div_cd'])}}>
+                                {{inst_div['inst_div_name']}}
+                            </option>
+                            {% endfor %}
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td>ULT施設名(漢字)：</td>
+					<td class="search_tb">
+						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kanji" 
+                        value="{{ultmarc.is_input_form_inst_name_kanji()}}" oninput="formBtDisabled()">
+					</td>
+					<!-- アルトマーク課題管理表No.8の修正 （カナ）⇒(かな・カナ)-->
+					<td>ULT施設名(かな・カナ)：</td>
+					<td class="search_tb">
+						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kana" 
+                        value="{{ultmarc.is_input_form_inst_name_kana()}}" oninput="formBtDisabled()">
+					</td>
+				</tr>
+				<tr>
+					<td>郵便番号：</td>
+					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_postal_number" 
+                        value="{{ultmarc.is_input_postal_number()}}" oninput="formBtDisabled()">
+					<td>電話番号：</td>
+					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_inst_phone_number" 
+                        value="{{ultmarc.is_input_inst_phone_number()}}" oninput="formBtDisabled()">
+                    </td>
+				</tr>
+				<tr>
+					<td>都道府県：</td>
+					<td class="search_tb">
+						<!-- 都道府県のドロップダウン -->
+						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead(controlCount)">
+							<!-- 都道府県ドロップダウンの中身を作成 -->
+							<option value=""></option>
+                            {% for prefc in ultmarc.prefc_models %}
+                            <option 
+                                value="{{prefc['prefc_cd']}}" {{ultmarc.is_selected_prefc_cd(prefc['prefc_cd'])}}>
+                                {{prefc['prefc_name']}}
+                            </option>
+                            {% endfor %}
+						</select>
+					</td>
+					<td>
+						<input type="checkbox" name="ctrl_delFlg" value="true" 
+						onchange="formBtDisabled()" {{ultmarc.is_checked_delFlg()}}> 削除施設表示
+					</td>
+				</tr>
+				<tr>
+					<td>ULT施設住所：</td>
+					<td class="search_tb">
+						<input class="text search_textbox" type="text" name="ctrl_inst_addr" 
+                        value="{{ultmarc.is_input_inst_addr()}}" oninput="formBtDisabled()">
+					</td>
+
+					<td class="search_btTd" colspan="2">
+						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr()">
+						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form>
+
+	<!--検索結果-->
+	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListPocessing()">
+		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton">
+        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ? -->
+		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
+        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
+		<!--検索件数-->
+		<!--ページネーション-->
+		<div id="light-pagination" class="pagination"></div>
+		<!--検索結果表示テーブル-->
+		<div class="scroll_table">
+			<table class="tablesorter instSearchResult" _fixedhead="rows:1; cols:1">
+				<thead>
+					<tr>
+						<th></th>
+						<th>ULT施設コード</th>
+						<th>削除</th>
+						<th>ULT施設名(漢字)</th>
+						<th>ULT施設住所(漢字)</th>
+						<th>郵便番号</th>
+						<th>施設電話番号</th>
+						<th>施設区分名</th>
+						<th>病院種別</th>
+						<th>都道府県</th>
+					</tr>
+				</thead>
+				<tbody id="result_data" class="result_data"></tbody>
+			</table>
+		</div>
+		<!--操作ボタン-->
+		<input class="send ult_bt info_bt" type="submit" name="detail" value="施設情報">
+	</form>
+
+	<script type="text/javascript">
+        // <! --ページネーションの作成-- >
+        $(function() {
+            // スピナー出さない場合は以下、エスケープせず埋め込む
+            // {% autoescape False%}
+            let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
+            // {% endautoescape%}
+            const searchResultData = JSON.parse(searchResultString)
+            if (searchResultData.length == 0) {
+                return
+            }
+            $(".pagination").pagination({
+                dataSource: function(done) {
+                    done(searchResultData)
+                },
+                pageNumber: 1, // 初期ページ番号
+                pageSize: 50, //表示するコンテンツ数
+                pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
+                ellipsisText: '...', //省略文字
+                prevText: 'Prev', //「前へ」の文字。エスケープ文字
+                nextText: 'Next', //「次へ」の文字。エスケープ文字
+                showNavigator: true,
+                formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
+                callback: function(data, pagination) {
+                    $('#result_data').html(pagination_content(data))
+                }
+            })
+        });
+        
+        function pagination_content(datas) {
+            const display_keys = [
+				'dcf_dsf_inst_cd',
+				'abolish_ymd',
+				'form_inst_name_kanji',
+				'inst_addr',
+				'postal_number',
+				'inst_phone_number',
+				'inst_div_name',
+				'hp_assrt_name',
+				'prefc_name'
+            ];
+			return datas.map(function (data) {
+				let td = display_keys.map((key) =>{
+					let inner_content = data[key];
+					if(key=='dcf_dsf_inst_cd')
+						inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}">${data['dcf_dsf_inst_cd']  || ''}</a>`;
+					if(key=='abolish_ymd' && data[key] != null)
+						inner_content = '削除';
+					return `<td>${inner_content || ''}</td>`
+				});
+				return  `
+				<tr class="result_data">
+					<td><div class="checkNum">
+						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()" 
+						value=${data['dcf_dsf_inst_cd']}>
+					</div></td>
+					${td}
+				</tr>
+				`
+			})
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/menu.html b/ecs/jskult-webapp/src/templates/menu.html
index 58f05375..db36bf61 100644
--- a/ecs/jskult-webapp/src/templates/menu.html
+++ b/ecs/jskult-webapp/src/templates/menu.html
@@ -14,7 +14,7 @@
         <a href="/ultmarc/docSearch" class="btn btn-primary btn-lg btn_width">Ultmarc照会（医師）</a><br><br>
       {% endif %}
       {% if menu.is_available_ult_inst_menu() %}
-        <a href="{{instSearchPath}}" class="btn btn-primary btn-lg btn_width">Ultmarc照会（施設）</a><br><br>
+        <a href="/ultmarc/instSearch" class="btn btn-primary btn-lg btn_width">Ultmarc照会（施設）</a><br><br>
       {% endif %}
       {% if menu.is_available_bio_menu() %}
         {% if not menu.is_batch_processing() %}

From ce883d8ad7d0c910e88cfe1a35f932ae38e8678e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Wed, 14 Jun 2023 09:41:07 +0900
Subject: [PATCH 11/24] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E5=89=8D=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/.env.example                |   1 +
 ecs/jskult-webapp/src/controller/ultmarc.py   | 108 +++++--
 .../model/db/ultmarc_doctor_wrkplace_count.py |   9 +
 .../src/model/db/ultmarc_inst_info.py         |  57 ++++
 .../src/model/db/ultmarc_inst_trt_course.py   |   9 +
 .../src/model/db/ultmarc_trt_course.py        |   2 +-
 .../src/model/request/ultmarc_inst.py         |   6 +-
 .../view/ultmarc_doctor_info_view_model.py    |  29 +-
 .../model/view/ultmarc_doctor_view_model.py   |  15 +-
 .../view/ultmarc_inst_info_view_model.py      | 264 ++++++++++++++++
 .../src/model/view/ultmarc_inst_view_model.py |  31 +-
 .../repositories/ultmarc_doctor_repository.py |   9 +-
 .../ultmarc_dr_wrkplace_his_repository.py     |  30 +-
 .../ultmarc_dr_wrkplace_repository.py         |  24 ++
 .../repositories/ultmarc_inst_repository.py   |  87 +++++-
 .../ultmarc_inst_trt_course_repository.py     |  31 ++
 .../ultmarc_trt_course_repository.py          |   6 +-
 .../src/services/ultmarc_view_service.py      |  26 ++
 .../src/system_var/environment.py             |   3 +-
 ecs/jskult-webapp/src/templates/docInfo.html  |  68 +++--
 .../src/templates/docSearch.html              |  43 ++-
 ecs/jskult-webapp/src/templates/instInfo.html | 285 ++++++++++++++++++
 .../src/templates/instSearch.html             |  62 +++-
 .../task_settings/web_task_settings.env       |   1 +
 24 files changed, 1089 insertions(+), 117 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_count.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
 create mode 100644 ecs/jskult-webapp/src/model/db/ultmarc_inst_trt_course.py
 create mode 100644 ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
 create mode 100644 ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py
 create mode 100644 ecs/jskult-webapp/src/templates/instInfo.html

diff --git a/ecs/jskult-webapp/.env.example b/ecs/jskult-webapp/.env.example
index f330f3d5..c604e43e 100644
--- a/ecs/jskult-webapp/.env.example
+++ b/ecs/jskult-webapp/.env.example
@@ -22,4 +22,5 @@ AWS_REGION=ap-northeast-1
 AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
+SEARCH_RESULT_MAX_COUNT=500
 SESSION_EXPIRE_MINUTE=20
diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index f4747bc8..914826c9 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -1,18 +1,15 @@
 from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, Request
-from fastapi.exceptions import HTTPException
-from starlette import status
+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
+from src.model.request.ultmarc_inst import UltmarcInstModel, UltmarcInstInfoModel
 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.system_var import constants
 from src.templates import templates
 
 router = APIRouter()
@@ -33,9 +30,6 @@ def ultmarc_inst_view(
     # バッチ処理中の場合、機能を利用させない
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
-
     # 検索項目の取得（都道府県・施設区分）
     ultmarc = ultmarc_service.ultmarc_inst_view(session)
     ultmarc.is_batch_processing = is_batch_processing
@@ -66,10 +60,9 @@ def search_inst(
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     session: UserSession = request.session
+
     # バッチ処理中の場合、機能を利用させない
     # is_batch_processing = batch_status_service.is_batch_processing()
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
 
     # 施設データを検索
     ultmarc_inst_data = ultmarc_service.search_inst_data(ultmarc_inst_form)
@@ -98,6 +91,89 @@ def search_inst(
     return templates_response
 
 
+@router.get('/instInfo')
+def ultmarc_inst_info_view(
+    request: Request,
+    id: str,
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
+    # 施設情報の取得
+    ultmarc = ultmarc_service.info_ultmarc_inst_view(id, session)
+    # バッチ起動判定の取得
+    ultmarc.is_batch_processing = is_batch_processing
+    # instId
+    ultmarc.instId = id
+    # ページ総数（件数）
+    ultmarc.postCnt = 1
+    # ページ数（表示するページNo）
+    ultmarc.pageNum = 0
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'instInfo.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
+@router.post('/instInfo')
+def ultmarc_inst_info_search(
+    request: Request,
+    ultmarc_inst_form: Optional[UltmarcInstInfoModel] = Depends(UltmarcInstInfoModel.as_form),
+    ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
+    batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
+):
+    session: UserSession = request.session
+    # バッチ処理中の場合、機能を利用させない
+    is_batch_processing = batch_status_service.is_batch_processing()
+
+    instId = ultmarc_inst_form.instId.split(',')
+
+    # 施設情報の取得
+    ultmarc = ultmarc_service.info_ultmarc_inst_view(instId[ultmarc_inst_form.pageNum], session)
+
+    # バッチ起動判定の取得
+    ultmarc.is_batch_processing = is_batch_processing
+    # InstId
+    ultmarc.instId = ultmarc_inst_form.instId
+    # ページ総数（件数）
+    ultmarc.postCnt = len(instId)
+    # ページ数（表示するページNo）
+    ultmarc.pageNum = ultmarc_inst_form.pageNum
+
+    # セッション書き換え
+    session.update(
+        actions=[
+            UserSession.last_access_time.set(UserSession.new_last_access_time()),
+            UserSession.record_expiration_time.set(UserSession.new_record_expiration_time()),
+        ]
+    )
+    session_key = set_session(session)
+    templates_response = templates.TemplateResponse(
+        'instInfo.html', {
+            'request': request,
+            'ultmarc': ultmarc,
+        },
+        headers={'session_key': session_key}
+    )
+    return templates_response
+
+
 @router.get('/docSearch')
 def ultmarc_doctor_view(
     request: Request,
@@ -108,9 +184,6 @@ def ultmarc_doctor_view(
     # バッチ処理中の場合、機能を利用させない
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
-
     # 検索項目の取得(都道府県)
     ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
     ultmarc.is_batch_processing = is_batch_processing
@@ -141,10 +214,9 @@ def search_doc(
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     session: UserSession = request.session
+
     # バッチ処理中の場合、機能を利用させない
     # is_batch_processing = batch_status_service.is_batch_processing()
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
 
     # 医師データを検索
     ultmarc_doctor_data = ultmarc_service.search_doctor_data(ultmarc_doctor_form)
@@ -184,9 +256,6 @@ def ultmarc_doctor_info_view(
     # バッチ処理中の場合、機能を利用させない
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
-
     # 医師情報の取得
     ultmarc = ultmarc_service.info_ultmarc_doctor_view(id, session)
     # バッチ起動判定の取得
@@ -227,9 +296,6 @@ def ultmarc_doctor_info_search(
     # バッチ処理中の場合、機能を利用させない
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    # if batch_status_service.is_batch_processing():
-    #     raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BATCH_PROCESSING)
-
     docId = ultmarc_doctor_form.docId.split(',')
 
     # 医師情報の取得
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_count.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_count.py
new file mode 100644
index 00000000..4482eab9
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace_count.py
@@ -0,0 +1,9 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcDoctorWrkplaceCountDBModel(BaseDBModel):
+    count: Optional[int]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
new file mode 100644
index 00000000..a72b38a9
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
@@ -0,0 +1,57 @@
+from typing import Optional
+from datetime import datetime
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcInstInfoDBModel(BaseDBModel):
+    dcf_dsf_inst_cd: Optional[str]
+    unconf_flg: Optional[str]
+    dup_opp_cd: Optional[str]
+    close_start_ym: Optional[str]
+    close_flg: Optional[str]
+    delete_sche_reason_cd: Optional[str]
+    abolish_ymd: Optional[str]
+    estab_sche_ym: Optional[str]
+    estab_sche_flg: Optional[str]
+    form_inst_name_kana: Optional[str]
+    form_inst_name_kanji: Optional[str]
+    inst_name_kana: Optional[str]
+    inst_name_kanji: Optional[str]
+    manage_cd: Optional[str]
+    postal_number: Optional[str]
+    inst_phone_number: Optional[str]
+    addr_unknown_reason_cd: Optional[str]
+    phone_number_non_flg: Optional[str]
+    inst_addr_kana: Optional[str]
+    inst_addr: Optional[str]
+    re_exam_cd: Optional[str]
+    rltd_univ_prnt_cd: Optional[str]
+    insp_item_micrb: Optional[str]
+    insp_item_serum: Optional[str]
+    insp_item_blood: Optional[str]
+    insp_item_patho: Optional[str]
+    insp_item_paras: Optional[str]
+    insp_item_biochem: Optional[str]
+    insp_item_ri: Optional[str]
+    prmit_bed_num_gen: Optional[str]
+    prmit_bed_num_rcup: Optional[str]
+    prmit_bed_num_mental: Optional[str]
+    prmit_bed_num_infection: Optional[str]
+    prmit_bed_num_tuber: Optional[str]
+    prmit_bed_num_other: Optional[str]
+    prmit_bed_num_sum: Optional[str]
+    ward_abolish_flg: Optional[str]
+    bed_num: Optional[str]
+    prmit_bed_maint_ymd: Optional[str]
+    inst_repre_cd: Optional[str]
+    inst_repre_kana: Optional[str]
+    inst_repre: Optional[str]
+    sys_update_date: Optional[datetime]
+    delete_sche_reason: Optional[str]
+    inst_div_name: Optional[str]
+    manage_name: Optional[str]
+    hp_assrt_name: Optional[str]
+    parent_name: Optional[str]
+    dcf_prnt_inst_cd: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_trt_course.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_trt_course.py
new file mode 100644
index 00000000..7c2ef6de
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_trt_course.py
@@ -0,0 +1,9 @@
+from typing import Optional
+
+from src.model.db.base_db_model import BaseDBModel
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class UltmarcInstTrtCourseDBModel(BaseDBModel):
+    trt_course_name_abb: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py b/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
index 23908fce..788d9748 100644
--- a/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
@@ -5,5 +5,5 @@ from src.util.sanitize import sanitize
 
 
 @sanitize
-class UltmarcTrtCoursedbmodel(BaseDBModel):
+class UltmarcTrtCourseDBModel(BaseDBModel):
     trt_course_name: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index f7919612..8b9a52c6 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -45,17 +45,17 @@ class UltmarcInstModel(BaseModel):
 
 
 class UltmarcInstInfoModel(BaseModel):
-    docId: Optional[str]
+    instId: Optional[str]
     pageNum: Optional[int]
 
     @classmethod
     def as_form(
         cls,
-        docId: str = Form(None),
+        instId: str = Form(None),
         pageNum: str = Form(None)
     ):
 
         return cls(
-            docId=docId,
+            instId=instId,
             pageNum=int(pageNum)
         )
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index 993bea14..0af599d4 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -1,17 +1,13 @@
-import json
-from collections import OrderedDict
-from datetime import datetime
+from datetime import datetime, date
 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_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.system_var import environment
 
 
@@ -19,7 +15,7 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     subtitle: str = '医師情報'
     is_batch_processing: Optional[bool]
     doctor_info_data: Optional[UltmarcDoctorInfoDBModel]
-    trt_coursed_data: Optional[list[UltmarcTrtCoursedbmodel]]
+    trt_coursed_data: Optional[list[UltmarcTrtCourseDBModel]]
     sosiety_data: Optional[list[UltmarcSosietyDBModel]]
     specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
     doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]
@@ -28,11 +24,6 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     postCnt: Optional[int]
     pageNum: Optional[int]
 
-    def ultmarc_data_json_str(self):
-        def date_handler(obj):
-            return obj.isoformat() if hasattr(obj, 'isoformat') else obj
-        return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
-
     # 医師コード
     def is_input_dcf_pcf_dr_cd(self):
         return self.doctor_info_data.dcf_pcf_dr_cd or ''
@@ -86,6 +77,11 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     def is_input_birthday_fromat(self):
         return self._format_date_string(self.doctor_info_data.birthday)
 
+    def is_input_ymd_fromat(self, ymd):
+        if ymd is None:
+            return ''
+        return ymd.strftime('%Y/%m/%d')
+
     def is_input_trt_course_data_size(self):
         return len(self.trt_coursed_data)
 
@@ -102,13 +98,16 @@ class UltmarcDoctorInfoViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
             return ''
-        date = datetime.strptime(date_string, '%Y%m%d')
-        return date.strftime('%Y/%m/%d')
+        date_str = datetime.strptime(date_string, '%Y%m%d')
+        return date_str.strftime('%Y/%m/%d')
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
+
+    def is_octor_wrkplace_data_count(self):
+        return len(self.doctor_wrkplace_data)
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index ea2afe48..47f55454 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -7,7 +7,7 @@ from pydantic import BaseModel
 
 from src.model.db.prefc_master import PrefcMasterModel
 from src.model.request.ultmarc_doctor import UltmarcDoctorModel
-from src.model.view.bio_disp_model import BisDisplayModel
+from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
 from src.system_var import environment
 
 
@@ -15,7 +15,7 @@ class UltmarcDoctorViewModel(BaseModel):
     subtitle: str = '医師検索一覧'
     is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
-    doctor_data: Optional[list[BisDisplayModel]] = []
+    doctor_data: Optional[list[UltmarcDoctorDBModel]] = []
     form_data: Optional[UltmarcDoctorModel]
 
     def ultmarc_data_json_str(self):
@@ -65,6 +65,11 @@ class UltmarcDoctorViewModel(BaseModel):
             return ''
         return self._selected_value(self.form_data.prefc_cd, selected_prefc_cd)
 
+    def is_input_form_prefc_cd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.prefc_cd or ''
+
     # 所属部科(漢字)
     def is_input_blng_sec_name(self):
         if not self.is_form_submitted():
@@ -99,13 +104,13 @@ class UltmarcDoctorViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
             return ''
-        date = datetime.strptime(date_string, '%Y%m%d')
-        return date.strftime('%Y/%m/%d')
+        date_str = datetime.strptime(date_string, '%Y%m%d')
+        return date_str.strftime('%Y/%m/%d')
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
new file mode 100644
index 00000000..6d64e04f
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
@@ -0,0 +1,264 @@
+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
+
+
+class UltmarcInstInfoViewModel(BaseModel):
+    subtitle: str = '施設情報'
+    is_batch_processing: Optional[bool]
+    inst_info_data: Optional[UltmarcInstInfoDBModel]
+    inst_trt_coursed_data: Optional[list[UltmarcInstTrtCourseDBModel]]
+    doctor_wrkplace_count: Optional[int]
+    instId: Optional[str]
+    postCnt: Optional[int]
+    pageNum: Optional[int]
+
+    # def ultmarc_data_json_str(self):
+    #     def date_handler(obj):
+    #         return obj.isoformat() if hasattr(obj, 'isoformat') else obj
+    #     return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
+
+    # 施設コード
+    def is_input_dcf_dsf_inst_cd(self):
+        return self.inst_info_data.dcf_dsf_inst_cd or ''
+
+    # 未確認
+    def is_checked_unconf_flg(self):
+        return 'checked' if self.inst_info_data.unconf_flg == '1' else ''
+
+    # 施設コード変換先
+    def is_input_dup_opp_cd(self):
+        return self.inst_info_data.dup_opp_cd or ''
+
+    # 休院店開始年月
+    def is_input_close_start_ym(self):
+        return self.inst_info_data.close_start_ym or ''
+
+    # 休院店
+    def is_checked_close_flg(self):
+        return 'checked' if self.inst_info_data.close_flg == '1' else ''
+
+    # 削除予定理由
+    def is_input_delete_sche_reason_cd(self):
+        return self.inst_info_data.delete_sche_reason_cd or ''
+
+    def is_input_delete_sche_reason(self):
+        return self.inst_info_data.delete_sche_reason or ''
+
+    # 削除日
+    def is_input_abolish_ymd(self):
+        return self.inst_info_data.abolish_ymd or ''
+
+    # 開業予定年月
+    def is_input_estab_sche_ym(self):
+        return self.inst_info_data.estab_sche_ym or ''
+
+    # 開業
+    def is_checked_estab_sche_flg(self):
+        return 'checked' if self.inst_info_data.estab_sche_flg == '1' else ''
+
+    # 正式施設名(カナ)
+    def is_input_form_inst_name_kana(self):
+        return self.inst_info_data.form_inst_name_kana or ''
+
+    # 正式施設名(漢字)
+    def is_input_form_inst_name_kanji(self):
+        return self.inst_info_data.form_inst_name_kanji or ''
+
+    # 略式施設名(カナ)
+    def is_input_inst_name_kana(self):
+        return self.inst_info_data.inst_name_kana or ''
+
+    # 施設区分名
+    def is_input_inst_div_name(self):
+        return self.inst_info_data.inst_div_name or ''
+
+    # 略式施設名(漢字)
+    def is_input_inst_name_kanji(self):
+        return self.inst_info_data.inst_name_kanji or ''
+
+    # 経営体
+    def is_input_manage_cd(self):
+        return self.inst_info_data.manage_cd or ''
+
+    def is_input_manage_name(self):
+        return self.inst_info_data.manage_name or ''
+
+    # 郵便番号
+    def is_input_postal_number(self):
+        return self.inst_info_data.postal_number or ''
+
+    # 住所不明
+    def is_checked_addr_unknown_reason_cd(self):
+        return 'checked' if self.inst_info_data.addr_unknown_reason_cd else ''
+
+    # 施設電話番号
+    def is_input_inst_phone_number(self):
+        return self.inst_info_data.inst_phone_number or ''
+
+    # 開業
+    def is_checked_phone_number_non_flg(self):
+        return 'checked' if self.inst_info_data.phone_number_non_flg == '1' else ''
+
+    # 住所（カナ）
+    def is_input_inst_addr_kana(self):
+        return self.inst_info_data.inst_addr_kana or ''
+
+    # 住所（漢字）
+    def is_input_inst_addr(self):
+        return self.inst_info_data.inst_addr or ''
+
+    # 病院種別
+    def is_input_hp_assrt_name(self):
+        return self.inst_info_data.hp_assrt_name or ''
+
+    # 再審査区分
+    def is_checked_re_exam_cd(self):
+        return 'checked' if self.inst_info_data.re_exam_cd else ''
+
+    # 関連大学親名
+    def is_input_rltd_univ_prnt_cd(self):
+        return self.inst_info_data.rltd_univ_prnt_cd or ''
+
+    def is_input_parent_name(self):
+        return self.inst_info_data.parent_name or ''
+
+    # 微生物
+    def is_input_insp_item_micrb(self):
+        return self.inst_info_data.insp_item_micrb or ''
+
+    # 血清
+    def is_input_insp_item_serum(self):
+        return self.inst_info_data.insp_item_serum or ''
+
+    # 血液
+    def is_input_insp_item_blood(self):
+        return self.inst_info_data.insp_item_blood or ''
+
+    # 病理
+    def is_input_insp_item_patho(self):
+        return self.inst_info_data.insp_item_patho or ''
+
+    # 寄生虫
+    def is_input_insp_item_paras(self):
+        return self.inst_info_data.insp_item_paras or ''
+
+    # 生化
+    def is_input_insp_item_biochem(self):
+        return self.inst_info_data.insp_item_biochem or ''
+
+    # RI
+    def is_input_insp_item_ri(self):
+        return self.inst_info_data.insp_item_ri or ''
+
+    # 特務医務室
+    def is_input_dcf_prnt_inst_cd(self):
+        return self.inst_info_data.dcf_prnt_inst_cd or ''
+
+    # 一般
+    def is_input_prmit_bed_num_gen(self):
+        return self.inst_info_data.prmit_bed_num_gen or ''
+
+    # 療養
+    def is_input_prmit_bed_num_rcup(self):
+        return self.inst_info_data.prmit_bed_num_rcup or ''
+
+    # 精神
+    def is_input_prmit_bed_num_mental(self):
+        return self.inst_info_data.prmit_bed_num_mental or ''
+
+    # 感染症
+    def is_input_prmit_bed_num_infection(self):
+        return self.inst_info_data.prmit_bed_num_infection or ''
+
+    # 結核
+    def is_input_prmit_bed_num_tuber(self):
+        return self.inst_info_data.prmit_bed_num_tuber or ''
+
+    # その他
+    def is_input_prmit_bed_num_other(self):
+        return self.inst_info_data.prmit_bed_num_other or ''
+
+    # 合計
+    def is_input_prmit_bed_num_sum(self):
+        return self.inst_info_data.prmit_bed_num_sum or ''
+
+    # 病棟閉鎖　　
+    def is_checked_ward_abolish_flg(self):
+        return 'checked' if self.inst_info_data.ward_abolish_flg == '1' else ''
+
+    # 一部病棟閉鎖
+    def is_checked_ward_abolish_flg_part(self):
+        return 'checked' if self.inst_info_data.ward_abolish_flg == '2' else ''
+
+    # 病床数(定員)
+    def is_input_bed_num(self):
+        return self.inst_info_data.bed_num or ''
+
+    # メンテ年月日
+    def is_input_prmit_bed_maint_ymd(self):
+        return self.inst_info_data.prmit_bed_maint_ymd or ''
+
+    # 代表者個人コード
+    def is_input_inst_repre_cd(self):
+        return self.inst_info_data.inst_repre_cd or ''
+
+    # 施設代表者(カナ)
+    def is_input_inst_repre_kana(self):
+        return self.inst_info_data.inst_repre_kana or ''
+
+    # 施設代表者(漢字)
+    def is_input_inst_repre(self):
+        return self.inst_info_data.inst_repre or ''
+
+    # 修正年月日
+    def is_input_sys_update_date(self):
+        sys_update_date = str(self.inst_info_data.sys_update_date)
+        return sys_update_date[:10]
+
+    # 勤務医師ボタン表示
+    def is_disabled_doctor_wrkplace(self):
+        return 'disabled' if self.doctor_wrkplace_count == 0 else ''
+
+    # 現在のページ（表示用）
+    def is_pageNum_view(self):
+        return self.pageNum + 1
+
+    # 前ボタン
+    def is_disabled_prev(self):
+        return 'disabled' if self.pageNum == 0 else ''
+
+    # 次ボタン
+    def is_disabled_next(self):
+        if self.pageNum == self.postCnt - 1:
+            return 'disabled'
+        return ''
+
+    # 診療科目のデータ件数
+    def is_input_inst_trt_course_data_size(self):
+        if self.inst_trt_coursed_data is None:
+            return 0
+        return len(self.inst_trt_coursed_data)
+
+    def is_data_string_empty_fromat(self, data_string):
+        return data_string or ''
+
+    def disabled_button(self):
+        return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
+
+    def is_form_submitted(self):
+        return self.form_data is not None
+
+    def is_data_empty(self):
+        return len(self.doctor_data) == 0
+
+    def is_data_overflow_max_length(self):
+        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
index a0b5107c..e728945a 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -7,7 +7,7 @@ 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.view.bio_disp_model import BisDisplayModel
+from src.model.db.ultmarc_inst import UltmarcInstDBModel
 from src.system_var import environment
 
 
@@ -16,7 +16,7 @@ class UltmarcInstViewModel(BaseModel):
     is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
     inst_div_models: list[InstDivMasterModel]
-    inst_data: Optional[list[BisDisplayModel]] = []
+    inst_data: Optional[list[UltmarcInstDBModel]] = []
     form_data: Optional[UltmarcInstModel]
 
     def ultmarc_data_json_str(self):
@@ -25,7 +25,7 @@ class UltmarcInstViewModel(BaseModel):
         return json.dumps([model.dict() for model in self.inst_data], ensure_ascii=False, default=date_handler)
 
     # ULT施設コード
-    def is_input_dcf_dsf_inst_cdd(self):
+    def is_input_dcf_dsf_inst_cd(self):
         if not self.is_form_submitted():
             return ''
         return self.form_data.dcf_dsf_inst_cd or ''
@@ -36,6 +36,11 @@ class UltmarcInstViewModel(BaseModel):
             return ''
         return self._selected_value(self.form_data.inst_div_cd, selected_inst_div_cd)
 
+    def is_input_form_inst_div_cd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.inst_div_cd or ''
+
     # ULT施設名(漢字)
     def is_input_form_inst_name_kanji(self):
         if not self.is_form_submitted():
@@ -63,9 +68,14 @@ class UltmarcInstViewModel(BaseModel):
     # 削除施設表示
     def is_checked_delFlg(self):
         if not self.is_form_submitted():
-            return ''
+            return 'checked'
         return self._checked_value(self.form_data.delFlg)
 
+    def is_input_delFlg(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.delFlg or ''
+
     # ULT施設住所
     def is_input_inst_addr(self):
         if not self.is_form_submitted():
@@ -78,6 +88,11 @@ class UltmarcInstViewModel(BaseModel):
             return ''
         return self._selected_value(self.form_data.prefc_cd, selected_prefc_cd)
 
+    def is_input_form_prefc_cd(self):
+        if not self.is_form_submitted():
+            return ''
+        return self.form_data.prefc_cd or ''
+
     def disabled_button(self):
         return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
 
@@ -85,16 +100,16 @@ class UltmarcInstViewModel(BaseModel):
         return self.form_data is not None
 
     def is_data_empty(self):
-        return len(self.doctor_data) == 0
+        return len(self.inst_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+        return len(self.inst_data) >= environment.SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
             return ''
-        date = datetime.strptime(date_string, '%Y%m%d')
-        return date.strftime('%Y/%m/%d')
+        date_str = datetime.strptime(date_string, '%Y%m%d')
+        return date_str.strftime('%Y/%m/%d')
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 60f1543d..5860148c 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -34,7 +34,7 @@ class UltmarcDoctorRepository(BaseRepository):
     LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
     WHERE
         {where_clause}
-    GROUP BY com_dr.dcf_pcf_dr_cd
+    GROUP BY com_dr.dcf_pcf_dr_cd, com_inst.dcf_dsf_inst_cd, com_blng_sec.blng_sec_cd
     ORDER BY
         com_dr.dcf_pcf_dr_cd,
         com_dr_wrkplace.dcf_dsf_inst_cd,
@@ -127,6 +127,13 @@ class UltmarcDoctorRepository(BaseRepository):
             parameter.grad_y = f'%{parameter.grad_y}%'
             where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y'))
 
+        # 検索条件が入力されていない場合
+        # if not where_clauses:
+        #     where_clauses.append(SQLCondition(
+        #         '', '', '(LENGTH(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True))
+        #     where_clauses.append(SQLCondition(
+        #         '', '', '(LENGTH(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)', literal=True))
+
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
index 14f0de45..67ab328d 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
@@ -5,21 +5,23 @@ 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.aply_start_ymd
-        FROM src05.com_dr
-        LEFT JOIN src05.com_dr_wrkplace ON com_dr.dcf_pcf_dr_cd = com_dr_wrkplace.dcf_pcf_dr_cd
-        LEFT JOIN src05.com_inst ON com_dr_wrkplace.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd
-        LEFT JOIN src05.com_blng_sec ON com_dr_wrkplace.blng_sec_cd = com_blng_sec.blng_sec_cd
-        LEFT JOIN src05.com_post as univ_post ON com_dr_wrkplace.identity_cd = univ_post.post_cd
-        LEFT JOIN src05.com_post as post ON com_dr_wrkplace.post_cd = post.post_cd
+        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
+        LEFT JOIN com_inst ON com_dr_wrkplace_his.dcf_dsf_inst_cd = com_inst.dcf_dsf_inst_cd
+        LEFT JOIN com_blng_sec ON com_dr_wrkplace_his.blng_sec_cd = com_blng_sec.blng_sec_cd
+        LEFT JOIN com_post as univ_post ON com_dr_wrkplace_his.identity_cd = univ_post.post_cd
+        LEFT JOIN com_post as post ON com_dr_wrkplace_his.post_cd = post.post_cd
         WHERE com_dr.dcf_pcf_dr_cd = :id
-        ORDER BY com_dr_wrkplace.aply_start_ymd DESC
+        ORDER BY com_dr_wrkplace_his.aply_end_ymd DESC,
+            com_dr_wrkplace_his.aply_start_ymd DESC
     """
 
     def fetch_many(self, id) -> list[UltmarcDoctorWrkplaceHisDBModel]:
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
index fd1295d7..cc6a9dc3 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
@@ -1,4 +1,6 @@
 from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel
+from src.model.db.ultmarc_doctor_wrkplace_count import UltmarcDoctorWrkplaceCountDBModel
+
 from src.repositories.base_repository import BaseRepository
 
 
@@ -37,3 +39,25 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository):
             raise e
         finally:
             self._database.disconnect()
+
+    FETCH_COUNT_SQL = """\
+        SELECT COUNT(*) AS count
+        FROM src05.com_dr_wrkplace
+        WHERE dcf_dsf_inst_cd = :id
+    """
+
+    def fetch_count(self, id) -> UltmarcDoctorWrkplaceCountDBModel:
+        try:
+            self._database.connect()
+            query = self.FETCH_COUNT_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcDoctorWrkplaceCountDBModel(**r) for r in result]
+            if len(models) == 0:
+                return 0
+            return models[0].count
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
index 438c429d..2cf08f77 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -1,6 +1,7 @@
 from src.db import sql_condition as condition
 from src.db.sql_condition import SQLCondition
 from src.model.db.ultmarc_inst import UltmarcInstDBModel
+from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel
 from src.model.request.ultmarc_inst import UltmarcInstModel
 from src.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
@@ -95,14 +96,94 @@ class UltmarcInstRepository(BaseRepository):
             where_clauses.append(SQLCondition('inst_addr', condition.LIKE, 'inst_addr'))
 
         # 削除表示フラグ
-        if is_not_empty(parameter.delFlg):
+        if is_not_empty(parameter.delFlg) == False:
             # 論理和での検索
             where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
 
         # 検索条件が入力されていない場合
-        if not where_clauses:
-            where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
+        # if not where_clauses:
+        #     where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
 
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
+
+    FETCH_ONE_SQL = """\
+        SELECT
+        com_inst.dcf_dsf_inst_cd,
+        com_inst.unconf_flg,
+        com_inst.dup_opp_cd,
+        com_inst.close_start_ym,
+        com_inst.close_flg,
+        com_inst.delete_sche_reason_cd,
+        com_inst.abolish_ymd,
+        com_inst.estab_sche_ym,
+        com_inst.estab_sche_flg,
+        com_inst.form_inst_name_kana,
+        com_inst.form_inst_name_kanji,
+        com_inst.inst_name_kana,
+        com_inst.inst_name_kanji,
+        com_inst.manage_cd,
+        com_inst.postal_number,
+        com_inst.inst_phone_number,
+        com_inst.addr_unknown_reason_cd,
+        com_inst.phone_number_non_flg,
+        com_inst.inst_addr_kana,
+        com_inst.inst_addr,
+        com_inst.re_exam_cd,
+        com_inst.rltd_univ_prnt_cd,
+        com_inst.insp_item_micrb,
+        com_inst.insp_item_serum,
+        com_inst.insp_item_blood,
+        com_inst.insp_item_patho,
+        com_inst.insp_item_paras,
+        com_inst.insp_item_biochem,
+        com_inst.insp_item_ri,
+        com_inst.prmit_bed_num_gen,
+        com_inst.prmit_bed_num_rcup,
+        com_inst.prmit_bed_num_mental,
+        com_inst.prmit_bed_num_infection,
+        com_inst.prmit_bed_num_tuber,
+        com_inst.prmit_bed_num_other,
+        com_inst.prmit_bed_num_sum,
+        com_inst.ward_abolish_flg,
+        com_inst.bed_num,
+        com_inst.prmit_bed_maint_ymd,
+        com_inst.inst_repre_cd,
+        com_inst.inst_repre_kana,
+        com_inst.inst_repre,
+        com_inst.sys_update_date,
+        com_inst_delete_sche_reason.delete_sche_reason,
+        com_inst_div.inst_div_name,
+        com_manage.manage_name,
+        com_hp_assrt.hp_assrt_name,
+        parent_inst.form_inst_name_kanji as parent_name,
+        com_spcare_med_office_dat.dcf_prnt_inst_cd
+        FROM src05.com_inst
+        LEFT JOIN src05.com_inst_div ON com_inst.inst_div_cd = com_inst_div.inst_div_cd
+        LEFT JOIN src05.com_inst_delete_sche_reason ON com_inst.delete_sche_reason_cd = com_inst_delete_sche_reason.delete_sche_reason_cd
+        LEFT JOIN src05.com_manage ON com_inst.manage_cd = com_manage.manage_cd
+        LEFT JOIN src05.com_inst_addr_unknown_reason ON com_inst.addr_unknown_reason_cd = com_inst_addr_unknown_reason.addr_unknown_reason_cd
+        LEFT JOIN src05.com_hp_assrt ON com_hp_assrt.hp_assrt_cd = com_inst.hp_assrt_cd
+        LEFT JOIN src05.com_re_exam ON com_inst.re_exam_cd = com_re_exam.re_exam_cd
+        LEFT JOIN src05.com_spcare_med_office_dat ON com_inst.dcf_dsf_inst_cd = com_spcare_med_office_dat.dcf_chld_inst_cd
+        LEFT JOIN src05.com_inst as parent_inst ON com_inst.rltd_univ_prnt_cd = parent_inst.dcf_dsf_inst_cd
+        WHERE com_inst.dcf_dsf_inst_cd = :id
+    \
+    """
+
+    def fetch_one(self, id) -> UltmarcInstInfoDBModel:
+        try:
+            self._database.connect()
+            query = self.FETCH_ONE_SQL
+            result = self._database.execute_select(query, {'id': id})
+            models = [UltmarcInstInfoDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models[0]
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
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
new file mode 100644
index 00000000..eaee391a
--- /dev/null
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py
@@ -0,0 +1,31 @@
+from src.model.db.ultmarc_inst_trt_course import UltmarcInstTrtCourseDBModel
+from src.repositories.base_repository import BaseRepository
+
+
+class UltmarcInstTrtCourseRepository(BaseRepository):
+
+    FETCH_SQL = """\
+        SELECT 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
+        WHERE com_inst.dcf_dsf_inst_cd = :id
+        ORDER BY com_trt_course.trt_course_cd
+    """
+
+    def fetch_many(self, id) -> list[UltmarcInstTrtCourseDBModel]:
+        try:
+            self._database.connect()
+            query = self.FETCH_SQL
+            result = self._database.execute_select(query, {'id': id})
+
+            models = [UltmarcInstTrtCourseDBModel(**r) for r in result]
+            if len(models) == 0:
+                return None
+            return models
+        except Exception as e:
+            # TODO: ファイルへの書き出しはloggerでやる
+            print(f"[ERROR] DB Error : Exception={e.args}")
+            raise e
+        finally:
+            self._database.disconnect()
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 f50fc02a..c76032a3 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
@@ -1,4 +1,4 @@
-from src.model.db.ultmarc_trt_course import UltmarcTrtCoursedbmodel
+from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel
 from src.repositories.base_repository import BaseRepository
 
 
@@ -13,13 +13,13 @@ class UltmarcTrtCourseRepository(BaseRepository):
         ORDER BY com_trt_course.trt_course_cd
     """
 
-    def fetch_many(self, id) -> list[UltmarcTrtCoursedbmodel]:
+    def fetch_many(self, id) -> list[UltmarcTrtCourseDBModel]:
         try:
             self._database.connect()
             query = self.FETCH_SQL
             result = self._database.execute_select(query, {'id': id})
 
-            models = [UltmarcTrtCoursedbmodel(**r) for r in result]
+            models = [UltmarcTrtCourseDBModel(**r) for r in result]
             if len(models) == 0:
                 return None
             return models
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 65cc57a0..d8103c93 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -11,6 +11,7 @@ from src.model.request.ultmarc_doctor import UltmarcDoctorModel
 from src.model.request.ultmarc_inst import UltmarcInstModel
 from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
 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
@@ -18,6 +19,7 @@ from src.repositories.inst_master_repository import InstDivMasterRepository
 from src.repositories.ultmarc_inst_repository import UltmarcInstRepository
 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
@@ -33,6 +35,7 @@ class UltmarcViewService(BaseService):
         'inst_div_repository': InstDivMasterRepository,
         'ultmarc_inst_repository': UltmarcInstRepository,
         'ultmarc_trt_course_repository': UltmarcTrtCourseRepository,
+        'ultmarc_inst_trt_course_repository': UltmarcInstTrtCourseRepository,
         'ultmarc_sosiety_repository': UltmarcSosietyRepository,
         'ultmarc_doctor_wrkplace_repository': UltmarcDoctorWrkplaceRepository,
         'ultmarc_doctor_wrkplace_his_repository': UltmarcDoctorWrkplaceHisRepository,
@@ -44,6 +47,7 @@ class UltmarcViewService(BaseService):
     inst_div_repository: InstDivMasterRepository
     ultmarc_inst_repository: UltmarcInstRepository
     ultmarc_trt_course_repository: UltmarcTrtCourseRepository
+    ultmarc_inst_trt_course_repository: UltmarcInstTrtCourseRepository
     ultmarc_sosiety_repository: UltmarcSosietyRepository
     ultmarc_doctor_wrkplace_repository: UltmarcDoctorWrkplaceRepository
     ultmarc_doctor_wrkplace_his_repository: UltmarcDoctorWrkplaceHisRepository
@@ -56,6 +60,7 @@ class UltmarcViewService(BaseService):
         self.inst_div_repository = repositories['inst_div_repository']
         self.ultmarc_inst_repository = repositories['ultmarc_inst_repository']
         self.ultmarc_trt_course_repository = repositories['ultmarc_trt_course_repository']
+        self.ultmarc_inst_trt_course_repository = repositories['ultmarc_inst_trt_course_repository']
         self.ultmarc_sosiety_repository = repositories['ultmarc_sosiety_repository']
         self.ultmarc_doctor_wrkplace_repository = repositories['ultmarc_doctor_wrkplace_repository']
         self.ultmarc_doctor_wrkplace_his_repository = repositories['ultmarc_doctor_wrkplace_his_repository']
@@ -93,6 +98,27 @@ class UltmarcViewService(BaseService):
         ultmarc_inst_data = self.ultmarc_inst_repository.fetch_many(parameter=search_params)
         return ultmarc_inst_data
 
+    def info_ultmarc_inst_view(
+        self,
+        id,
+        session: UserSession
+    ) -> UltmarcInstInfoViewModel:
+
+        # 施設情報画面の表示データ取得
+        # 施設情報を取得
+        inst_info = self.ultmarc_inst_repository.fetch_one(id)
+        # 診療科目情報を取得
+        inst_trt_course = self.ultmarc_inst_trt_course_repository.fetch_many(id)
+        # 医師件数を取得
+        doctor_count = self.ultmarc_doctor_wrkplace_repository.fetch_count(id)
+
+        ultmarc = UltmarcInstInfoViewModel(
+            inst_info_data=inst_info,
+            inst_trt_coursed_data=inst_trt_course,
+            doctor_wrkplace_count=doctor_count
+        )
+        return ultmarc
+
     def search_doctor_data(self, search_params: UltmarcDoctorModel):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
diff --git a/ecs/jskult-webapp/src/system_var/environment.py b/ecs/jskult-webapp/src/system_var/environment.py
index aed9916c..cd54d35d 100644
--- a/ecs/jskult-webapp/src/system_var/environment.py
+++ b/ecs/jskult-webapp/src/system_var/environment.py
@@ -19,4 +19,5 @@ DB_PASSWORD = os.environ['DB_PASSWORD']
 DB_SCHEMA = os.environ['DB_SCHEMA']
 
 BIO_SEARCH_RESULT_MAX_COUNT = int(os.environ['BIO_SEARCH_RESULT_MAX_COUNT'])
-SESSION_EXPIRE_MINUTE=int(os.environ['SESSION_EXPIRE_MINUTE'])
\ No newline at end of file
+SEARCH_RESULT_MAX_COUNT = int(os.environ['SEARCH_RESULT_MAX_COUNT'])
+SESSION_EXPIRE_MINUTE = int(os.environ['SESSION_EXPIRE_MINUTE'])
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index 1202faee..7e807303 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -33,7 +33,7 @@
 <body>
 	<table class="docHeaderTable">
 		<tr>
-			<td class="docHeaderTd"><h1>医師情報</h1></td>
+			<td class="docHeaderTd"><h1>{{ultmarc.subtitle}}</h1></td>
 			<td class="docHeaderTdCenter docHeaderTdCenter">
 				{% if ultmarc.is_batch_processing %}
 				<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
@@ -50,16 +50,29 @@
 				<input type="hidden" name="docId" value="{{ultmarc.DocId}}">
 				<input type="hidden" name="pageNum" id="pageNum" value="{{ultmarc.pageNum}}">
 				<td class="instHeaderTd">
-					<input type="button" name="prev" id="prev"  value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
+					<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
 				</td>
 				<td class="instHeaderTd">
 					{{ultmarc.is_pageNum_view()}}／{{ultmarc.postCnt}}
 				</td>
 				<td class="instHeaderTd">
-					<input type="button" name="next" id="next"  value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
+					<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
 				</td>
 			</form>
-			<form name="instSearch" method="get" action="/ultmarc/docSearch">
+			<form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch">
+				<script>
+					var form = document.getElementById("instSearch");
+					for (var i = 0, length = sessionStorage.length; i < length; ++i) {
+						let key = sessionStorage.key(i);
+						let value = sessionStorage.getItem(key);
+						const input = document.createElement('input');
+						input.setAttribute('type', 'text');
+						input.value = value;
+						input.name = key;
+						form.appendChild(input);
+					}
+
+				</script>
 				<td class="instHeaderTd">
 					<input type="submit" name="ctrl_docBackBt" class="transitionBt" value="医師検索一覧へ">
 				</td>
@@ -175,35 +188,44 @@
 					<th>終了年月日</th>
 				</tr>
 			</thead>
+			<script>
+				function OnLinkClick(){
+					sessionStorage.clear();
+					return true;
+				}
+			</script>
 			<tbody>
-					{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
-					{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd) != ''%}
-						<tr>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}</td>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.inst_name_kanji)}}</td>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.blng_sec_name)}}</td>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.univ_post_name)}}</td>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.post_name)}}</td>
-							<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.aply_start_ymd)}}</td>
-							<td>9999/99/99</td>
-						</tr>
-					{% endif %}
-					{% endfor %}
-
+				{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
+				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd) != ''%}
+					<tr>
+						<td><a href="/ultmarc/instInfo?id={{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}" onclick="OnLinkClick();">
+							{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}</a></td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.inst_name_kanji)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.blng_sec_name)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.univ_post_name)}}</td>
+						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.post_name)}}</td>
+						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_data.aply_start_ymd)}}</td>
+						<td>9999/99/99</td>
+					</tr>
+				{% endif %}
+				{% endfor %}
+				<!-- if ultmarc.is_octor_wrkplace_data_count == 0  -->
 				{% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
 				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd) != ''%}
-				<tr>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}</td>
+					<tr>
+						<td><a href="/ultmarc/instInfo?id={{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}" onclick="OnLinkClick();">
+							{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}
+						</a></td>
 						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.inst_name_kanji)}}</td>
 						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.blng_sec_name)}}</td>
 						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.univ_post_name)}}</td>
 						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.post_name)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.aply_start_ymd)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.aply_end_ymd)}}</td>
+						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_his_data.aply_start_ymd)}}</td>
+						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_his_data.aply_end_ymd)}}</td>
 					</tr>
 				{% endif %}
 				{% endfor %}
-
+				<!-- endif -->
 			</tbody>
 		</table>
 	</div>
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index c3168212..403b7f33 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -22,7 +22,7 @@
 <body>
 	<table class="docHeaderTable">
 		<tr>
-			<td class="docHeaderTd"><h1>医師検索一覧</h1></td>
+			<td class="docHeaderTd"><h1>{{ultmarc.subtitle}}</h1></td>
 			<td class="docHeaderTdCenter docHeaderTdCenter">
 				{% if ultmarc.is_batch_processing %}
 				<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
@@ -140,7 +140,17 @@
                 <tbody id="result_data" class="result_data"></tbody>
 
 			</table>
-            
+			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
+			<div class="resultAreaMsg">
+				検索結果が最大件数を超えました。検索条件を見直しして下さい。
+			</div>
+			{% endif %}
+			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
+			<div class="resultAreaMsg">
+				対象のデータが存在しません。
+			</div>
+			{% endif %}
+					
 		</div>
 		<!--操作ボタン-->
 		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報" >
@@ -156,8 +166,24 @@
             const searchResultData = JSON.parse(searchResultString)
             if (searchResultData.length == 0) {
                 return
-            }
-            $(".pagination").pagination({
+            }else if(searchResultData.length > 500){
+				return
+			}
+			// 検索条件をセッションに入れる
+			sessionStorage.clear();
+			sessionStorage.setItem('ctrl_dcf_pcf_dr_cd','{{ultmarc.is_input_dcf_pcf_dr_cd()}}');
+			sessionStorage.setItem('ctrl_dr_name','{{ultmarc.is_input_dr_name()}}');
+			sessionStorage.setItem('ctrl_dr_name_kana','{{ultmarc.is_input_dr_name_kana()}}');
+			sessionStorage.setItem('ctrl_dcf_dsf_inst_cd','{{ultmarc.is_input_dcf_dsf_inst_cd()}}');
+			sessionStorage.setItem('ctrl_form_inst_name_kanji','{{ultmarc.is_input_form_inst_name_kanji()}}');
+			sessionStorage.setItem('ctrl_form_inst_name_kana','{{ultmarc.is_input_form_inst_name_kana()}}');
+			sessionStorage.setItem('ctrl_prefc_cd','{{ultmarc.is_input_form_prefc_cd()}}');
+			sessionStorage.setItem('ctrl_blng_sec_name','{{ultmarc.is_input_blng_sec_name()}}');
+			sessionStorage.setItem('ctrl_trt_course_name','{{ultmarc.is_input_trt_course_name()}}');
+			sessionStorage.setItem('ctrl_alma','{{ultmarc.is_input_alma()}}');
+			sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}');
+
+			$(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
                 },
@@ -175,6 +201,11 @@
             })
         });
         
+		function OnLinkClick(){
+			sessionStorage.clear();
+			return true;
+		}
+
         function pagination_content(datas) {
             const display_keys = [
 				'dcf_pcf_dr_cd',
@@ -192,7 +223,7 @@
 					if(key=='dcf_pcf_dr_cd')
 						inner_content = `<a href="/ultmarc/docInfo?id=${data['dcf_pcf_dr_cd']}">${data['dcf_pcf_dr_cd']  || ''}</a>`;
 					if(key=='dcf_dsf_inst_cd')
-						inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}">${data['form_inst_name_kanji']  || ''}</a>`;
+						inner_content = `<a href="/ultmarc/instInfo?id=${data['dcf_dsf_inst_cd']}" onclick="OnLinkClick()">${data['form_inst_name_kanji']  || ''}</a>`;
 					return `<td>${inner_content || ''}</td>`
 				});
 				return  `
@@ -208,7 +239,7 @@
 			})
 		}
 
-		// 配列パラメータを加工にする
+		配列パラメータを加工にする
 		function CheckBoxListPocessing()
 		{
 			var vals = []; // 配列を定義
diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html
new file mode 100644
index 00000000..2ce03d2b
--- /dev/null
+++ b/ecs/jskult-webapp/src/templates/instInfo.html
@@ -0,0 +1,285 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    {% with subtitle = ultmarc.subtitle %}
+    {% include '_header.html' %}
+    {% endwith  %}
+    <link rel="stylesheet" href="/static/css/ultStyle.css">
+
+	<script type="text/javascript">
+		window.onload = function(){
+            // 見出し固定初期化
+            FixedMidashi.create();
+            // ボタン、テキストボックス初期化
+            formBtDisabled();
+		}
+	</script>
+	<script>
+		$(function(){
+			// 前ページ遷移処理
+			$('#prev').click(function(){
+				$('#pageNum').val(Number($('#pageNum').val()) - 1);
+				$('#instInfo').submit();
+			});
+			// 次ページ遷移処理
+			$('#next').click(function(){
+				$('#pageNum').val(Number($('#pageNum').val()) + 1);
+				$('#instInfo').submit();
+			});
+		});
+	</script>
+</head>
+
+<body>
+	<h1>
+        {{ultmarc.subtitle}}
+    </h1>
+	{% if ultmarc.is_batch_processing %}
+		<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+	{% endif %}
+
+	<!-- 上部のボタン -->
+	<table class="instHeaderTable">
+		<tr>
+			<form name="docSearch" method="post" action="/ultmarc/docSearch">
+				<td class="instHeaderTd">
+					<input type="hidden" name="ctrl_dcf_dsf_inst_cd" value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}">
+					<input name="docSearchBt" class="transitionBt" type="submit" value="勤務医師" {{ultmarc.is_disabled_doctor_wrkplace()}}>
+				</td>
+			</form>
+			<form id="instInfo" name="instInfo" method="post" action="/ultmarc/instInfo">
+				<input type="hidden" name="instId" value="{{ultmarc.instId}}">
+				<input type="hidden" name="pageNum" id="pageNum" value="{{ultmarc.pageNum}}">
+				<td class="instHeaderTd">
+					<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
+				</td>
+				<td class="instHeaderTd">
+					{{ultmarc.is_pageNum_view()}}／{{ultmarc.postCnt}}
+				</td>
+				<td class="instHeaderTd">
+					<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
+				</td>
+			</form>
+			<form id="instSearch" name="instSearch" method="" action="/ultmarc/instSearch" onsubmit="chg_send_method()">
+				<script>
+					var form = document.getElementById("instSearch");
+					for (var i = 0, length = sessionStorage.length; i < length; ++i) {
+						let key = sessionStorage.key(i);
+						let value = sessionStorage.getItem(key);
+						const input = document.createElement('input');
+						input.setAttribute('type', 'text');
+						input.value = value;
+						input.name = key;
+						form.appendChild(input);
+					}
+
+				</script>
+			
+				<td class="instHeaderTd">
+					<input type="submit" name="instSearchBt" class="transitionBt" value="施設検索一覧へ">
+				</td>
+			</form>
+			<script>
+				function chg_send_method(){
+					if(sessionStorage.length == 0){
+						$('#instSearch')('method', 'GET');
+					}else{
+						$('#instSearch').attr('method', 'POST');
+					}
+					return true;
+				}
+			</script>
+		</tr>
+	</table>
+
+	<!-- 施設情報 -->
+	<table class="instInfoTable">
+		<tbody>
+			<tr>
+				<td class="instInfoColumn">施設コード</td>
+				<td class="instData instDataLeft">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" class="instCdTextbox">
+					<input class="checkbox" type="checkbox" disabled="disabled" {{ultmarc.is_checked_unconf_flg()}}>未確認
+				</td>
+				<td class="instInfoColumn">施設コード変換先</td>
+				<td class="instData instDataCenter">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_dup_opp_cd()}}" class="instDataCenterTextbox">
+				</td>
+				<td class="instInfoColumn">休院店開始年月</td>
+				<td class="instData instDataRight">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_close_start_ym()}}" class="instDataSmallTextbox">
+					<input type="checkbox" disabled="disabled" {{ultmarc.is_checked_close_flg()}}>休院店
+				</td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">削除予定理由</td>
+				<td class="instData instDataLeft"><input type="text" readonly="readonly" value="{{ultmarc.is_input_delete_sche_reason_cd()}}" class="delReasonCdTextbox"><input type="text" readonly="readonly" value="{{ultmarc.is_input_delete_sche_reason()}}" class="delReasonTextbox"></td>
+				<td class="instInfoColumn">削除日</td>
+				<td class="instData instDataCenter">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_abolish_ymd()}}" class="instDataCenterTextbox">
+				</td>
+				<td class="instInfoColumn">開業予定年月</td>
+				<td class="instData instDataRight">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_estab_sche_ym()}}" class="instDataSmallTextbox">
+					<input type="checkbox" disabled="disabled" {{ultmarc.is_checked_estab_sche_flg()}}>開業
+				</td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">正式施設名(カナ)</td>
+				<td class="instData"  colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_form_inst_name_kana()}}" class="instInfoTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">正式施設名(漢字)</td>
+				<td class="instData" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_form_inst_name_kanji()}}" class="instInfoTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">略式施設名(カナ)</td>
+				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_name_kana()}}" class="instInfoTextbox"></td>
+				<td class="instInfoColumn">施設区分名</td>
+				<td class="instData instDataSmall"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_div_name()}}" class="instInfoTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">略式施設名(漢字)</td>
+				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_name_kanji()}}" class="instInfoTextbox"></td>
+				<td class="instInfoColumn">経営体</td>
+				<td class="instData instDataSmall">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_manage_cd()}}" class="manageTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_manage_name()}}" class="textboxMargin manageTextbox">
+				</td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">郵便番号</td>
+				<td class="instData instDataMid"  colspan="3">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_postal_number()}}">
+					<input type="checkbox" class="checkboxMargin" disabled="disabled" {{ultmarc.is_checked_addr_unknown_reason_cd()}}>住所不明
+				</td>
+				<td class="instInfoColumn">施設電話番号</td>
+				<td class="instData instDataRight">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_phone_number()}}" class="instDataSmallTextbox">
+					<input type="checkbox" class="checkboxMargin" disabled="disabled" {{ultmarc.is_checked_phone_number_non_flg()}}>電話なし
+				</td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">住所（カナ）</td>
+				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_addr_kana()}}" class="instInfoTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">住所（漢字）</td>
+				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_addr()}}" class="instInfoTextbox"></td>
+			</tr>
+		</tbody>
+	</table>
+
+    <hr>
+
+    <!-- 病院情報 -->
+	<table class="instInfoTableHalf1">
+		<tbody>
+			<tr>
+				<td class="hpInfoColumn">病院種別</td>
+				<td class="instData hpAssrtTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_hp_assrt_name()}}" class="hpAssrtTextbox"></td>
+				<td class="instData reExamTd"><input type="checkbox" disabled="disabled" {{ultmarc.is_checked_re_exam_cd()}}>再審査区分</input></td>
+				<td class="hpInfoColumn">関連大学親名</td>
+				<td class="instData">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_rltd_univ_prnt_cd()}}" class="parentCdTextBox">
+					<input type="text" readonly="readonly" value="{{ultmarc.is_input_parent_name()}}" class="parentNameTextBox">
+				</td>
+			</tr>
+			<tr>
+				<td class="hpInfoColumn">診療科目</td>
+				<td class="instData border_bottom_none" colspan="4">
+					{% if ultmarc.inst_trt_coursed_data != None %}
+						{% for inst_trt_course_data in ultmarc.inst_trt_coursed_data %}
+							<input class="trtCourseTextbox" type="text" readonly="readonly" value="{{inst_trt_course_data.trt_course_name_abb}}">
+						{% endfor %}
+					{% endif %}
+					{% for i in range(60-ultmarc.is_input_inst_trt_course_data_size()) %}
+						<input class="trtCourseTextbox" type="text" readonly="readonly">
+					{% endfor %}
+
+				</td>
+			</tr>
+			<tr>
+				<td class="hpInfoColumn">検査工程</td>
+				<td class="instData" colspan="4">
+					<label>微生物</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_micrb()}}">
+					<label>血清</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_serum()}}">
+					<label>血液</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_blood()}}">
+					<label>病理</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_patho()}}">
+					<label>寄生虫</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_paras()}}">
+					<label>生化</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_biochem()}}">
+					<label>RI</label>
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_ri()}}">
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<table class="instInfoTableHalf2">
+			<tbody>
+			<tr>
+				<td class="hpInfoColumn">特務医務室</td>
+				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_prnt_inst_cd()}}" class="xSmallTextbox"></td>
+				<td rowspan="2" class="hpInfoColumn">許可病床数</td>
+				<td class="instData bedTd" rowspan="2">
+					<table>
+						<tbody>
+							<tr>
+								<td>一般</td>
+								<td>療養</td>
+								<td>精神</td>
+								<td>感染症</td>
+								<td>結核</td>
+								<td>その他</td>
+								<td>合計</td>
+							</tr>
+							<tr>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_gen()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_rcup()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_mental()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_infection()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_tuber()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_other()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_sum()}}"></td>
+							</tr>
+						</tbody>
+					</table>
+				</td>
+				<td class="instData" colspan="2"><input type="checkbox" disabled="disabled" {{ultmarc.is_checked_ward_abolish_flg()}}>病棟閉鎖　　<input type="checkbox" disabled="disabled" {{ultmarc.is_checked_ward_abolish_flg_part()}}>一部病棟閉鎖</td>
+			</tr>
+			<tr>
+				<td class="hpInfoColumn">病床数(定員)</td>
+				<td class="instData"><input type="text" readonly="readonly" value="{{ultmarc.is_input_bed_num()}}" class="xSmallTextbox numberBox"></td>
+				<td class="hpInfoColumn">メンテ年月日</td>
+				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_maint_ymd()}}" class="xSmallTextbox"></td>
+			</tr>
+		</tbody>
+	</table>
+	<!-- 施設代表者 -->
+	<table class="instInfoTable">
+		<tbody>
+			<tr>
+				<td class="instInfoColumn">代表者個人コード</td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre_cd()}}" class="repreTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">施設代表者(カナ)</td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre_kana()}}" class="repreTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">施設代表者(漢字)</td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre()}}" class="repreTextbox"></td>
+			</tr>
+			<tr>
+				<td class="instInfoColumn">修正年月日</td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_sys_update_date()}}" class="repreTextbox"></td>
+			</tr>
+		</tbody>
+	</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 92db85ae..15988f05 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
 	<script type="text/javascript">
-		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
+		controlCount = 8; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
 
 		window.onload = function(){
             // 見出し固定初期化
@@ -23,7 +23,7 @@
 	<!-- タイトルと上部ボタン -->
 		<table class="instSearchHeaderTable">
 			<tr>
-				<td class="instSearchHeaderTd"><h1>施設検索一覧</h1></td>
+				<td class="instSearchHeaderTd"><h1>{{ultmarc.subtitle}}</h1></td>
 				<td class="instSearchHeaderTdCenter instSearchHeaderTdCenter">
                     {% if ultmarc.is_batch_processing %}
                         <div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
@@ -33,14 +33,14 @@
 			</tr>
 		</table>
 	<!-- 入力フォーム -->
-	<form class="_form" name="search" action="/ultmarc/instSearch" method="POST">
+	<form id="inst_search" class="_form" name="search" action="/ultmarc/instSearch" method="POST">
 		<table class="search_table">
 			<tbody>
 				<tr>
 					<td>ULT施設コード：</td>
 					<td class="search_tb leftSearch_tb">
 						<input class="text search_textbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
-                        value="{{ultmarc.is_input_dcf_dsf_inst_cdd()}}" oninput="formBtDisabled()">
+                        value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" oninput="formBtDisabled()">
 					</td>
 					<td>施設区分：</td>
 					<td class="search_tb">
@@ -93,8 +93,8 @@
 						</select>
 					</td>
 					<td>
-						<input type="checkbox" name="ctrl_delFlg" value="true" 
-						onchange="formBtDisabled()" {{ultmarc.is_checked_delFlg()}}> 削除施設表示
+						<label><input type="checkbox" name="ctrl_delFlg" value="true" 
+						onchange="formBtDisabled()" {{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
 					</td>
 				</tr>
 				<tr>
@@ -103,7 +103,6 @@
 						<input class="text search_textbox" type="text" name="ctrl_inst_addr" 
                         value="{{ultmarc.is_input_inst_addr()}}" oninput="formBtDisabled()">
 					</td>
-
 					<td class="search_btTd" colspan="2">
 						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr()">
 						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
@@ -116,9 +115,9 @@
 	<!--検索結果-->
 	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListPocessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton">
-        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ? -->
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
-        <!-- <?php if ($dtCnt['countNum'] <= 0){ echo "disabled"; } ?> -->
+		<input type="hidden" name="instId" id="instId" value="">
+		<input type="hidden" name="pageNum" value="0">
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -141,7 +140,18 @@
 				</thead>
 				<tbody id="result_data" class="result_data"></tbody>
 			</table>
-		</div>
+			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
+			<div class="resultAreaMsg">
+				検索結果が最大件数を超えました。検索条件を見直しして下さい。
+			</div>
+			{% endif %}
+			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
+			<div class="resultAreaMsg">
+				対象のデータが存在しません。
+			</div>
+			{% endif %}
+			</div>
+
 		<!--操作ボタン-->
 		<input class="send ult_bt info_bt" type="submit" name="detail" value="施設情報">
 	</form>
@@ -149,14 +159,29 @@
 	<script type="text/javascript">
         // <! --ページネーションの作成-- >
         $(function() {
-            // スピナー出さない場合は以下、エスケープせず埋め込む
-            // {% autoescape False%}
-            let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
+			// {% autoescape False%}
+			let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
             // {% endautoescape%}
             const searchResultData = JSON.parse(searchResultString)
             if (searchResultData.length == 0) {
                 return
             }
+            if (searchResultData.length > 500) {
+				return
+            }
+
+			// 検索条件をセッションに入れる
+			sessionStorage.clear();
+			sessionStorage.setItem('ctrl_dcf_dsf_inst_cd','{{ultmarc.is_input_dcf_dsf_inst_cd()}}');
+			sessionStorage.setItem('ctrl_inst_div_cd','{{ultmarc.is_input_form_inst_div_cd()}}');
+			sessionStorage.setItem('ctrl_form_inst_name_kanji','{{ultmarc.is_input_form_inst_name_kanji()}}');
+			sessionStorage.setItem('ctrl_form_inst_name_kana','{{ultmarc.is_input_form_inst_name_kana()}}');
+			sessionStorage.setItem('ctrl_postal_number','{{ultmarc.is_input_postal_number()}}');
+			sessionStorage.setItem('ctrl_inst_phone_number','{{ultmarc.is_input_inst_phone_number()}}');
+			sessionStorage.setItem('ctrl_prefc_cd','{{ultmarc.is_input_form_prefc_cd()}}');
+			sessionStorage.setItem('ctrl_delFlg','{{ultmarc.is_input_delFlg()}}');
+			sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
+
             $(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
@@ -187,6 +212,7 @@
 				'hp_assrt_name',
 				'prefc_name'
             ];
+
 			return datas.map(function (data) {
 				let td = display_keys.map((key) =>{
 					let inner_content = data[key];
@@ -207,6 +233,16 @@
 				`
 			})
 		}
+
+		// 配列パラメータを加工にする
+		function CheckBoxListPocessing()
+		{
+			var vals = []; // 配列を定義
+			$('input[name="data"]:checked').each(function() {
+				vals.push( $(this).val() ); // 配列に値を追加
+			});
+			$("#instId").val(vals.join(','));
+		}
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/s3/config/jskult/task_settings/web_task_settings.env b/s3/config/jskult/task_settings/web_task_settings.env
index 9cd4ecf8..b10c9342 100644
--- a/s3/config/jskult/task_settings/web_task_settings.env
+++ b/s3/config/jskult/task_settings/web_task_settings.env
@@ -4,3 +4,4 @@ AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
 SESSION_EXPIRE_MINUTE=20
+SEARCH_RESULT_MAX_COUNT=500

From 5359486197fa214974a56888d1ec0b2cb498e84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Wed, 14 Jun 2023 15:35:55 +0900
Subject: [PATCH 12/24] =?UTF-8?q?delFlg=5Fctrl=20=E8=8B=A6=E8=82=89?=
 =?UTF-8?q?=E3=81=AE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/model/request/ultmarc_inst.py         |  4 ++--
 .../repositories/ultmarc_doctor_repository.py |  9 ++-------
 .../src/templates/bioSearchList.html          |  4 ++--
 .../src/templates/docSearch.html              |  2 --
 .../src/templates/instSearch.html             | 20 +++++++++----------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index 8b9a52c6..ba06a443 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -28,7 +28,7 @@ class UltmarcInstModel(BaseModel):
         ctrl_postal_number: str = Form(None),
         ctrl_inst_phone_number: str = Form(None),
         ctrl_prefc_cd: str = Form(None),
-        ctrl_delFlg: str = Form(None),
+        delFlg_ctrl: str = Form(None),
         ctrl_inst_addr: str = Form(None)
     ):
         return cls(
@@ -39,7 +39,7 @@ class UltmarcInstModel(BaseModel):
             postal_number=ctrl_postal_number,
             inst_phone_number=ctrl_inst_phone_number,
             prefc_cd=ctrl_prefc_cd,
-            delFlg=ctrl_delFlg,
+            delFlg=delFlg_ctrl,
             inst_addr=ctrl_inst_addr
         )
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 5860148c..bd89db0b 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -34,6 +34,8 @@ class UltmarcDoctorRepository(BaseRepository):
     LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
     WHERE
         {where_clause}
+        AND (length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)
+        AND (length(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)
     GROUP BY com_dr.dcf_pcf_dr_cd, com_inst.dcf_dsf_inst_cd, com_blng_sec.blng_sec_cd
     ORDER BY
         com_dr.dcf_pcf_dr_cd,
@@ -127,13 +129,6 @@ class UltmarcDoctorRepository(BaseRepository):
             parameter.grad_y = f'%{parameter.grad_y}%'
             where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y'))
 
-        # 検索条件が入力されていない場合
-        # if not where_clauses:
-        #     where_clauses.append(SQLCondition(
-        #         '', '', '(LENGTH(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True))
-        #     where_clauses.append(SQLCondition(
-        #         '', '', '(LENGTH(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)', literal=True))
-
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index d44247c1..09f1a718 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -176,12 +176,12 @@
             </table>
             {% if bio.is_form_submitted() and bio.is_data_overflow_max_length() %}
             <div class="resultAreaMsg">
-                検索結果が最大件数を超えました。検索条件を見直しして下さい。
+                検索件数が500件を超えています 検索項目を見直してください
             </div>
             {% endif %}
             {% if bio.is_form_submitted() and bio.is_data_empty() %}
             <div class="resultAreaMsg">
-                対象のデータが存在しません。
+                対象のデータが存在しません
             </div>
             {% endif %}
         </div>
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 403b7f33..0b86e837 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
 	<script type="text/javascript">
-		controlCount = 11; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
-
 		window.onload = function(){
             // 見出し固定初期化
             FixedMidashi.create();
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 15988f05..d27197f4 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="/static/css/ultStyle.css">
 
 	<script type="text/javascript">
-		controlCount = 8; // 検索フォームの入力ボックスの数 アルトマーク課題管理表No.2の修正
-
 		window.onload = function(){
             // 見出し固定初期化
             FixedMidashi.create();
@@ -49,7 +47,7 @@
 							<option value=""></option>
                             {% for inst_div in ultmarc.inst_div_models %}
                             <option value="{{inst_div['inst_div_cd']}}" {{ultmarc.is_selected_inst_div_cd(inst_div['inst_div_cd'])}}>
-                                {{inst_div['inst_div_name']}}
+                                {{inst_div['inst_div_cd']}}:{{inst_div['inst_div_name']}}
                             </option>
                             {% endfor %}
 						</select>
@@ -81,7 +79,7 @@
 					<td>都道府県：</td>
 					<td class="search_tb">
 						<!-- 都道府県のドロップダウン -->
-						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead(controlCount)">
+						<select class="text search_dropdown" name="ctrl_prefc_cd" onchange="formBtDisabled()" onkeyup="formBtDisablead()">
 							<!-- 都道府県ドロップダウンの中身を作成 -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
@@ -93,8 +91,8 @@
 						</select>
 					</td>
 					<td>
-						<label><input type="checkbox" name="ctrl_delFlg" value="true" 
-						onchange="formBtDisabled()" {{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
+						<label><input type="checkbox" name="delFlg_ctrl" value="true" 
+							{{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
 					</td>
 				</tr>
 				<tr>
@@ -104,8 +102,8 @@
                         value="{{ultmarc.is_input_inst_addr()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="search_btTd" colspan="2">
-						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr()">
-						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit">
+						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr()" >
+						<input class="ult_bt search_bt" id="search_bt" name="search_bt" value="検索" type="submit" >
 					</td>
 				</tr>
 			</tbody>
@@ -142,12 +140,12 @@
 			</table>
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
 			<div class="resultAreaMsg">
-				検索結果が最大件数を超えました。検索条件を見直しして下さい。
+				検索件数が500件を超えています 検索項目を見直してください
 			</div>
 			{% endif %}
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
 			<div class="resultAreaMsg">
-				対象のデータが存在しません。
+				対象のデータが存在しません
 			</div>
 			{% endif %}
 			</div>
@@ -179,7 +177,7 @@
 			sessionStorage.setItem('ctrl_postal_number','{{ultmarc.is_input_postal_number()}}');
 			sessionStorage.setItem('ctrl_inst_phone_number','{{ultmarc.is_input_inst_phone_number()}}');
 			sessionStorage.setItem('ctrl_prefc_cd','{{ultmarc.is_input_form_prefc_cd()}}');
-			sessionStorage.setItem('ctrl_delFlg','{{ultmarc.is_input_delFlg()}}');
+			sessionStorage.setItem('delFlg_ctrl','{{ultmarc.is_input_delFlg()}}');
 			sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
 
             $(".pagination").pagination({

From 2880d75c25a0d6be8b36ed1da1916a30a761a3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Thu, 15 Jun 2023 09:00:24 +0900
Subject: [PATCH 13/24] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/repositories/ultmarc_doctor_repository.py        | 9 +++++++--
 .../src/repositories/ultmarc_inst_repository.py          | 4 ----
 ecs/jskult-webapp/src/templates/docSearch.html           | 4 +---
 ecs/jskult-webapp/src/templates/instSearch.html          | 3 ---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index bd89db0b..153d8164 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -34,8 +34,6 @@ class UltmarcDoctorRepository(BaseRepository):
     LEFT JOIN src05.com_alma ON com_dr.alma_cd = com_alma.alma_cd
     WHERE
         {where_clause}
-        AND (length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)
-        AND (length(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)
     GROUP BY com_dr.dcf_pcf_dr_cd, com_inst.dcf_dsf_inst_cd, com_blng_sec.blng_sec_cd
     ORDER BY
         com_dr.dcf_pcf_dr_cd,
@@ -129,6 +127,13 @@ class UltmarcDoctorRepository(BaseRepository):
             parameter.grad_y = f'%{parameter.grad_y}%'
             where_clauses.append(SQLCondition('grad_y', condition.LIKE, 'grad_y'))
 
+        # 廃業除外
+        if where_clauses:
+            where_clauses.append(SQLCondition(
+                '', '', '(length(com_inst.abolish_ymd) = 0 OR com_inst.abolish_ymd IS NULL)', literal=True))
+            where_clauses.append(SQLCondition(
+                '', '', '(length(com_dr.abolish_ymd) = 0 OR com_dr.abolish_ymd IS NULL)', literal=True))
+
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
index 2cf08f77..0baaf56e 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -100,10 +100,6 @@ class UltmarcInstRepository(BaseRepository):
             # 論理和での検索
             where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
 
-        # 検索条件が入力されていない場合
-        # if not where_clauses:
-        #     where_clauses.append(SQLCondition('', '', '(length(abolish_ymd) = 0 OR abolish_ymd IS NULL)', literal=True))
-
         where_clauses_str = ' AND '.join([condition.apply() for condition in where_clauses])
 
         return where_clauses_str
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 0b86e837..e505fa13 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -162,9 +162,7 @@
             let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
             // {% endautoescape%}
             const searchResultData = JSON.parse(searchResultString)
-            if (searchResultData.length == 0) {
-                return
-            }else if(searchResultData.length > 500){
+            if(searchResultData.length > 500){
 				return
 			}
 			// 検索条件をセッションに入れる
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index d27197f4..8cb92402 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -161,9 +161,6 @@
 			let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
             // {% endautoescape%}
             const searchResultData = JSON.parse(searchResultString)
-            if (searchResultData.length == 0) {
-                return
-            }
             if (searchResultData.length > 500) {
 				return
             }

From 1cc17f3116ad299be2b38276aae1e95934a6f704 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Thu, 15 Jun 2023 15:05:45 +0900
Subject: [PATCH 14/24] =?UTF-8?q?fix:=20=E3=82=B3=E3=83=B3=E3=83=95?=
 =?UTF-8?q?=E3=83=AA=E3=82=AF=E3=83=88=E3=81=AE=E8=A7=A3=E6=B6=88=E3=83=9F?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ecs/jskult-webapp/src/main.py b/ecs/jskult-webapp/src/main.py
index 023f86aa..2aca351c 100644
--- a/ecs/jskult-webapp/src/main.py
+++ b/ecs/jskult-webapp/src/main.py
@@ -5,7 +5,9 @@ from fastapi.staticfiles import StaticFiles
 from starlette import status
 
 import src.static as static
-from src.controller import bio, bio_download, healthcheck, ultmarc, login, logout, menu
+from src.controller import (bio, bio_download, healthcheck, login, logout,
+                            menu, root, ultmarc)
+from src.controller.sample_send_file import router as sample_router
 from src.core import tasks
 from src.error.exception_handler import http_exception_handler
 from src.error.exceptions import UnexpectedException

From dbf7a98e66433fe77e723f9131d2ca29c97d6938 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Thu, 15 Jun 2023 15:29:32 +0900
Subject: [PATCH 15/24] =?UTF-8?q?feat:=20=E3=83=95=E3=82=A9=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   | 10 +++---
 .../src/model/db/ultmarc_doctor_wrkplace.py   |  2 +-
 .../model/db/ultmarc_doctor_wrkplace_his.py   |  2 +-
 .../src/model/db/ultmarc_inst_info.py         |  3 +-
 .../view/ultmarc_doctor_info_view_model.py    | 13 ++++---
 .../model/view/ultmarc_doctor_view_model.py   |  3 +-
 .../view/ultmarc_inst_info_view_model.py      |  4 ---
 .../src/model/view/ultmarc_inst_view_model.py |  4 +--
 .../repositories/prefc_master_repository.py   |  2 +-
 .../repositories/ultmarc_doctor_repository.py |  4 +--
 .../ultmarc_dr_wrkplace_his_repository.py     | 17 ++++-----
 .../ultmarc_dr_wrkplace_repository.py         |  4 +--
 .../repositories/ultmarc_inst_repository.py   |  2 +-
 .../ultmarc_specialist_license_repository.py  |  5 +--
 .../src/services/ultmarc_view_service.py      | 36 +++++++++----------
 15 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 914826c9..65b3628c 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -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()
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
index c8f555cc..2737644e 100644
--- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
@@ -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
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 3fe3de38..b7077fd0 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,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
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
index a72b38a9..5f829d97 100644
--- a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
@@ -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
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index 0af599d4..6636d180 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -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
 
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 47f55454..62d83c65 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -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
 
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
index 6d64e04f..aea90678 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
@@ -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
 
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
index e728945a..9246d792 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -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
 
 
diff --git a/ecs/jskult-webapp/src/repositories/prefc_master_repository.py b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py
index a8cf288f..c304f59f 100644
--- a/ecs/jskult-webapp/src/repositories/prefc_master_repository.py
+++ b/ecs/jskult-webapp/src/repositories/prefc_master_repository.py
@@ -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
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 153d8164..61552ecf 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -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):
             # 必ず部分一致で検索
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
index 67ab328d..1fab4d45 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
@@ -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
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
index cc6a9dc3..b05ce6fd 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
@@ -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
 
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
index 0baaf56e..2ceebd0a 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -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))
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
index 35632081..a4927b44 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
@@ -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
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index d8103c93..0855f288 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -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):

From abe13984a2c32a537b6602263fa41f069796fba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Thu, 15 Jun 2023 17:38:29 +0900
Subject: [PATCH 16/24] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/.env.example                |  2 +-
 ecs/jskult-webapp/src/controller/ultmarc.py   | 64 +++++++++----------
 .../src/model/request/ultmarc_doctor.py       | 14 ++--
 .../src/model/request/ultmarc_inst.py         | 12 ++--
 .../view/ultmarc_doctor_info_view_model.py    | 22 +++----
 .../model/view/ultmarc_doctor_view_model.py   | 13 +---
 .../view/ultmarc_inst_info_view_model.py      | 21 +++---
 .../src/model/view/ultmarc_inst_view_model.py |  9 +--
 .../repositories/ultmarc_doctor_repository.py |  8 +--
 .../src/services/ultmarc_view_service.py      |  4 +-
 .../src/system_var/environment.py             |  2 +-
 ecs/jskult-webapp/src/templates/docInfo.html  | 12 ++--
 .../src/templates/docSearch.html              |  6 +-
 ecs/jskult-webapp/src/templates/instInfo.html | 10 +--
 .../src/templates/instSearch.html             |  6 +-
 .../task_settings/web_task_settings.env       |  2 +-
 16 files changed, 90 insertions(+), 117 deletions(-)

diff --git a/ecs/jskult-webapp/.env.example b/ecs/jskult-webapp/.env.example
index 075dc005..d6fcbdcc 100644
--- a/ecs/jskult-webapp/.env.example
+++ b/ecs/jskult-webapp/.env.example
@@ -22,6 +22,6 @@ AWS_REGION=ap-northeast-1
 AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
-SEARCH_RESULT_MAX_COUNT=500
+UTL_SEARCH_RESULT_MAX_COUNT=500
 SESSION_EXPIRE_MINUTE=20
 LOG_LEVEL=DEBUG
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 65b3628c..00678cb0 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -5,7 +5,7 @@ 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 (UltmarcDoctorInfoModel,
-                                              UltmarcDoctorModel)
+                                              UltmarcDoctorSearchModel)
 from src.model.request.ultmarc_inst import (UltmarcInstInfoModel,
                                             UltmarcInstModel)
 from src.router.session_router import AuthenticatedRoute
@@ -29,7 +29,7 @@ def ultmarc_inst_view(
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 検索項目の取得（都道府県・施設区分）
@@ -63,15 +63,15 @@ def search_inst(
 ):
     session: UserSession = request.session
 
-    # バッチ処理中の場合、機能を利用させない
-    # is_batch_processing = batch_status_service.is_batch_processing()
+    # バッチ処理中ステータスを取得
+    is_batch_processing = batch_status_service.is_batch_processing()
 
     # 施設データを検索
     ultmarc_inst_data = ultmarc_service.search_inst_data(ultmarc_inst_form)
 
     # 検索項目の取得（都道府県・施設区分）
     ultmarc = ultmarc_service.ultmarc_inst_view(session)
-    ultmarc.is_batch_processing = batch_status_service.is_batch_processing()
+    ultmarc.is_batch_processing = is_batch_processing
     ultmarc.inst_data = ultmarc_inst_data
     ultmarc.form_data = ultmarc_inst_form
 
@@ -101,19 +101,19 @@ def ultmarc_inst_info_view(
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 施設情報の取得
     ultmarc = ultmarc_service.info_ultmarc_inst_view(id, session)
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
-    # instId
-    ultmarc.instId = id
+    # inst_id
+    ultmarc.inst_id = id
     # ページ総数（件数）
-    ultmarc.postCnt = 1
+    ultmarc.post_cnt = 1
     # ページ数（表示するページNo）
-    ultmarc.pageNum = 0
+    ultmarc.page_num = 0
 
     # セッション書き換え
     session.update(
@@ -141,22 +141,22 @@ def ultmarc_inst_info_search(
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    instId = ultmarc_inst_form.instId.split(',')
+    inst_id = ultmarc_inst_form.inst_id.split(',')
 
     # 施設情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_inst_view(instId[ultmarc_inst_form.pageNum], session)
+    ultmarc = ultmarc_service.info_ultmarc_inst_view(inst_id[ultmarc_inst_form.page_num], session)
 
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
-    # InstId
-    ultmarc.instId = ultmarc_inst_form.instId
+    # inst_id
+    ultmarc.inst_id = ultmarc_inst_form.inst_id
     # ページ総数（件数）
-    ultmarc.postCnt = len(instId)
+    ultmarc.post_cnt = len(inst_id)
     # ページ数（表示するページNo）
-    ultmarc.pageNum = ultmarc_inst_form.pageNum
+    ultmarc.page_num = ultmarc_inst_form.page_num
 
     # セッション書き換え
     session.update(
@@ -183,7 +183,7 @@ def ultmarc_doctor_view(
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 検索項目の取得(都道府県)
@@ -211,13 +211,13 @@ def ultmarc_doctor_view(
 @router.post('/docSearch')
 def search_doc(
     request: Request,
-    ultmarc_doctor_form: Optional[UltmarcDoctorModel] = Depends(UltmarcDoctorModel.as_form),
+    ultmarc_doctor_form: Optional[UltmarcDoctorSearchModel] = Depends(UltmarcDoctorSearchModel.as_form),
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     session: UserSession = request.session
 
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     # is_batch_processing = batch_status_service.is_batch_processing()
 
     # 医師データを検索
@@ -255,19 +255,19 @@ def ultmarc_doctor_info_view(
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 医師情報の取得
     ultmarc = ultmarc_service.info_ultmarc_doctor_view(id, session)
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
-    # DocId
-    ultmarc.DocId = id
+    # doc_id
+    ultmarc.doc_id = id
     # ページ総数（件数）
-    ultmarc.postCnt = 1
+    ultmarc.post_cnt = 1
     # ページ数（表示するページNo）
-    ultmarc.pageNum = 0
+    ultmarc.page_num = 0
 
     # セッション書き換え
     session.update(
@@ -295,21 +295,21 @@ def ultmarc_doctor_info_search(
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
     session: UserSession = request.session
-    # バッチ処理中の場合、機能を利用させない
+    # バッチ処理中ステータスを取得
     is_batch_processing = batch_status_service.is_batch_processing()
 
-    docId = ultmarc_doctor_form.docId.split(',')
+    doc_id = ultmarc_doctor_form.doc_id.split(',')
 
     # 医師情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_doctor_view(docId[ultmarc_doctor_form.pageNum], session)
+    ultmarc = ultmarc_service.info_ultmarc_doctor_view(doc_id[ultmarc_doctor_form.page_num], session)
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
-    # DocId
-    ultmarc.DocId = ultmarc_doctor_form.docId
+    # doc_id
+    ultmarc.doc_id = ultmarc_doctor_form.doc_id
     # ページ総数（件数）
-    ultmarc.postCnt = len(docId)
+    ultmarc.post_cnt = len(doc_id)
     # ページ数（表示するページNo）
-    ultmarc.pageNum = ultmarc_doctor_form.pageNum
+    ultmarc.page_num = ultmarc_doctor_form.page_num
 
     # セッション書き換え
     session.update(
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
index 0633624e..135869b9 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -7,7 +7,7 @@ from src.util.sanitize import sanitize
 
 
 @sanitize
-class UltmarcDoctorModel(BaseModel):
+class UltmarcDoctorSearchModel(BaseModel):
     dcf_pcf_dr_cd: Optional[str]
     dr_name: Optional[str]
     dr_name_kana: Optional[str]
@@ -52,17 +52,17 @@ class UltmarcDoctorModel(BaseModel):
 
 
 class UltmarcDoctorInfoModel(BaseModel):
-    docId: Optional[str]
-    pageNum: Optional[int]
+    doc_id: Optional[str]
+    page_num: Optional[int]
 
     @classmethod
     def as_form(
         cls,
-        docId: str = Form(None),
-        pageNum: str = Form(None)
+        doc_id: str = Form(None),
+        page_num: str = Form(None)
     ):
 
         return cls(
-            docId=docId,
-            pageNum=int(pageNum)
+            doc_id=doc_id,
+            page_num=int(page_num)
         )
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index ba06a443..1b5972ff 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -45,17 +45,17 @@ class UltmarcInstModel(BaseModel):
 
 
 class UltmarcInstInfoModel(BaseModel):
-    instId: Optional[str]
-    pageNum: Optional[int]
+    inst_id: Optional[str]
+    page_num: Optional[int]
 
     @classmethod
     def as_form(
         cls,
-        instId: str = Form(None),
-        pageNum: str = Form(None)
+        inst_id: str = Form(None),
+        page_num: str = Form(None)
     ):
 
         return cls(
-            instId=instId,
-            pageNum=int(pageNum)
+            inst_id=inst_id,
+            page_num=int(page_num)
         )
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index 6636d180..ddbd5542 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -23,9 +23,9 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
     doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]
     doctor_wrkplace_his_data: Optional[list[UltmarcDoctorWrkplaceHisDBModel]]
-    DocId: Optional[str]
-    postCnt: Optional[int]
-    pageNum: Optional[int]
+    doc_id: Optional[str]
+    post_cnt: Optional[int]
+    page_num: Optional[int]
 
     # 医師コード
     def is_input_dcf_pcf_dr_cd(self):
@@ -64,16 +64,16 @@ class UltmarcDoctorInfoViewModel(BaseModel):
         return self.doctor_info_data.estab_y or ''
 
     # 現在のページ（表示用）
-    def is_pageNum_view(self):
-        return self.pageNum + 1
+    def is_page_num_view(self):
+        return self.page_num + 1
 
     # 前ボタン
     def is_disabled_prev(self):
-        return 'disabled' if self.pageNum == 0 else ''
+        return 'disabled' if self.page_num == 0 else ''
 
     # 次ボタン
     def is_disabled_next(self):
-        if self.pageNum == self.postCnt - 1:
+        if self.page_num == self.post_cnt - 1:
             return 'disabled'
         return ''
 
@@ -101,16 +101,10 @@ class UltmarcDoctorInfoViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
             return ''
         date_str = datetime.strptime(date_string, '%Y%m%d')
         return date_str.strftime('%Y/%m/%d')
-
-    def _selected_value(self, form_value: str, current_value: str):
-        return 'selected' if form_value == current_value else ''
-
-    def is_octor_wrkplace_data_count(self):
-        return len(self.doctor_wrkplace_data)
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 62d83c65..a97956fd 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -1,12 +1,11 @@
 import json
-from datetime import datetime
 from typing import Optional
 
 from pydantic import BaseModel
 
 from src.model.db.prefc_master import PrefcMasterModel
 from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
-from src.model.request.ultmarc_doctor import UltmarcDoctorModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
 from src.system_var import environment
 
 
@@ -15,7 +14,7 @@ class UltmarcDoctorViewModel(BaseModel):
     is_batch_processing: Optional[bool]
     prefc_models: list[PrefcMasterModel]
     doctor_data: Optional[list[UltmarcDoctorDBModel]] = []
-    form_data: Optional[UltmarcDoctorModel]
+    form_data: Optional[UltmarcDoctorSearchModel]
 
     def ultmarc_data_json_str(self):
         def date_handler(obj):
@@ -103,13 +102,7 @@ class UltmarcDoctorViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
-
-    def _format_date_string(self, date_string):
-        if date_string is None:
-            return ''
-        date_str = datetime.strptime(date_string, '%Y%m%d')
-        return date_str.strftime('%Y/%m/%d')
+        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
index aea90678..7caad57b 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
@@ -13,14 +13,9 @@ class UltmarcInstInfoViewModel(BaseModel):
     inst_info_data: Optional[UltmarcInstInfoDBModel]
     inst_trt_coursed_data: Optional[list[UltmarcInstTrtCourseDBModel]]
     doctor_wrkplace_count: Optional[int]
-    instId: Optional[str]
-    postCnt: Optional[int]
-    pageNum: Optional[int]
-
-    # def ultmarc_data_json_str(self):
-    #     def date_handler(obj):
-    #         return obj.isoformat() if hasattr(obj, 'isoformat') else obj
-    #     return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
+    inst_id: Optional[str]
+    post_cnt: Optional[int]
+    page_num: Optional[int]
 
     # 施設コード
     def is_input_dcf_dsf_inst_cd(self):
@@ -225,16 +220,16 @@ class UltmarcInstInfoViewModel(BaseModel):
         return 'disabled' if self.doctor_wrkplace_count == 0 else ''
 
     # 現在のページ（表示用）
-    def is_pageNum_view(self):
-        return self.pageNum + 1
+    def is_page_num_view(self):
+        return self.page_num + 1
 
     # 前ボタン
     def is_disabled_prev(self):
-        return 'disabled' if self.pageNum == 0 else ''
+        return 'disabled' if self.page_num == 0 else ''
 
     # 次ボタン
     def is_disabled_next(self):
-        if self.pageNum == self.postCnt - 1:
+        if self.page_num == self.post_cnt - 1:
             return 'disabled'
         return ''
 
@@ -257,4 +252,4 @@ class UltmarcInstInfoViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
index 9246d792..f98794d3 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -1,5 +1,4 @@
 import json
-from datetime import datetime
 from typing import Optional
 
 from pydantic import BaseModel
@@ -103,13 +102,7 @@ class UltmarcInstViewModel(BaseModel):
         return len(self.inst_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.inst_data) >= environment.SEARCH_RESULT_MAX_COUNT
-
-    def _format_date_string(self, date_string):
-        if date_string is None:
-            return ''
-        date_str = datetime.strptime(date_string, '%Y%m%d')
-        return date_str.strftime('%Y/%m/%d')
+        return len(self.inst_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 61552ecf..7aff6444 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -2,7 +2,7 @@ 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.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel
-from src.model.request.ultmarc_doctor import UltmarcDoctorModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
 from src.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
 
@@ -43,11 +43,11 @@ class UltmarcDoctorRepository(BaseRepository):
     \
     """
 
-    def fetch_many(self, parameter: UltmarcDoctorModel) -> list[UltmarcDoctorDBModel]:
+    def fetch_many(self, parameter: UltmarcDoctorSearchModel) -> list[UltmarcDoctorDBModel]:
         try:
             self._database.connect()
             # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
-            clone_parameter = UltmarcDoctorModel(**parameter.dict())
+            clone_parameter = UltmarcDoctorSearchModel(**parameter.dict())
             where_clause = self.__build_condition(clone_parameter)
             query = self.FETCH_SQL.format(where_clause=where_clause)
             result = self._database.execute_select(query, clone_parameter.dict())
@@ -61,7 +61,7 @@ class UltmarcDoctorRepository(BaseRepository):
         finally:
             self._database.disconnect()
 
-    def __build_condition(self, parameter: UltmarcDoctorModel):
+    def __build_condition(self, parameter: UltmarcDoctorSearchModel):
         where_clauses: list[SQLCondition] = []
 
         # 医師コード
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 0855f288..44f99cda 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -1,6 +1,6 @@
 from src.aws.aws_api_client import AWSAPIClient
 from src.model.internal.session import UserSession
-from src.model.request.ultmarc_doctor import UltmarcDoctorModel
+from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
 from src.model.request.ultmarc_inst import UltmarcInstModel
 from src.model.view.ultmarc_doctor_info_view_model import \
     UltmarcDoctorInfoViewModel
@@ -119,7 +119,7 @@ class UltmarcViewService(BaseService):
         )
         return ultmarc
 
-    def search_doctor_data(self, search_params: UltmarcDoctorModel):
+    def search_doctor_data(self, search_params: UltmarcDoctorSearchModel):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
         return ultmarc_doctor_data
diff --git a/ecs/jskult-webapp/src/system_var/environment.py b/ecs/jskult-webapp/src/system_var/environment.py
index d4f5d3a4..91b661b3 100644
--- a/ecs/jskult-webapp/src/system_var/environment.py
+++ b/ecs/jskult-webapp/src/system_var/environment.py
@@ -19,7 +19,7 @@ DB_PASSWORD = os.environ['DB_PASSWORD']
 DB_SCHEMA = os.environ['DB_SCHEMA']
 
 BIO_SEARCH_RESULT_MAX_COUNT = int(os.environ['BIO_SEARCH_RESULT_MAX_COUNT'])
-SEARCH_RESULT_MAX_COUNT = int(os.environ['SEARCH_RESULT_MAX_COUNT'])
+UTL_SEARCH_RESULT_MAX_COUNT = int(os.environ['UTL_SEARCH_RESULT_MAX_COUNT'])
 SESSION_EXPIRE_MINUTE = int(os.environ['SESSION_EXPIRE_MINUTE'])
 
 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO')
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index 7e807303..1a40192b 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -18,12 +18,12 @@
 		$(function(){
 			// 前ページ遷移処理
 			$('#prev').click(function(){
-				$('#pageNum').val(Number($('#pageNum').val()) - 1);
+				$('#page_num').val(Number($('#page_num').val()) - 1);
 				$('#instInfo').submit();
 			});
 			// 次ページ遷移処理
 			$('#next').click(function(){
-				$('#pageNum').val(Number($('#pageNum').val()) + 1);
+				$('#page_num').val(Number($('#page_num').val()) + 1);
 				$('#instInfo').submit();
 			});
 		});
@@ -47,13 +47,13 @@
 	<table class="instHeaderTable">
 		<tr>
 			<form id="instInfo" name="instInfo" method="post" action="/ultmarc/docInfo">
-				<input type="hidden" name="docId" value="{{ultmarc.DocId}}">
-				<input type="hidden" name="pageNum" id="pageNum" value="{{ultmarc.pageNum}}">
+				<input type="hidden" name="doc_id" value="{{ultmarc.doc_id}}">
+				<input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
 				<td class="instHeaderTd">
 					<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
 				</td>
 				<td class="instHeaderTd">
-					{{ultmarc.is_pageNum_view()}}／{{ultmarc.postCnt}}
+					{{ultmarc.is_page_num_view()}}／{{ultmarc.post_cnt}}
 				</td>
 				<td class="instHeaderTd">
 					<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
@@ -209,7 +209,6 @@
 					</tr>
 				{% endif %}
 				{% endfor %}
-				<!-- if ultmarc.is_octor_wrkplace_data_count == 0  -->
 				{% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
 				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd) != ''%}
 					<tr>
@@ -225,7 +224,6 @@
 					</tr>
 				{% endif %}
 				{% endfor %}
-				<!-- endif -->
 			</tbody>
 		</table>
 	</div>
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index e505fa13..3d532374 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -114,8 +114,8 @@
 	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListPocessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
-		<input type="hidden" name="docId" id="docId" value="">
-		<input type="hidden" name="pageNum" value="0">
+		<input type="hidden" name="doc_id" id="doc_id" value="">
+		<input type="hidden" name="page_num" value="0">
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -242,7 +242,7 @@
 			$('input[name="data"]:checked').each(function() {
 				vals.push( $(this).val() ); // 配列に値を追加
 			});
-			$("#docId").val(vals.join(','));
+			$("#doc_id").val(vals.join(','));
 		}
 </script>
 </body>
diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html
index 2ce03d2b..b582b54d 100644
--- a/ecs/jskult-webapp/src/templates/instInfo.html
+++ b/ecs/jskult-webapp/src/templates/instInfo.html
@@ -18,12 +18,12 @@
 		$(function(){
 			// 前ページ遷移処理
 			$('#prev').click(function(){
-				$('#pageNum').val(Number($('#pageNum').val()) - 1);
+				$('#page_num').val(Number($('#page_num').val()) - 1);
 				$('#instInfo').submit();
 			});
 			// 次ページ遷移処理
 			$('#next').click(function(){
-				$('#pageNum').val(Number($('#pageNum').val()) + 1);
+				$('#page_num').val(Number($('#page_num').val()) + 1);
 				$('#instInfo').submit();
 			});
 		});
@@ -48,13 +48,13 @@
 				</td>
 			</form>
 			<form id="instInfo" name="instInfo" method="post" action="/ultmarc/instInfo">
-				<input type="hidden" name="instId" value="{{ultmarc.instId}}">
-				<input type="hidden" name="pageNum" id="pageNum" value="{{ultmarc.pageNum}}">
+				<input type="hidden" name="inst_id" value="{{ultmarc.inst_id}}">
+				<input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
 				<td class="instHeaderTd">
 					<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
 				</td>
 				<td class="instHeaderTd">
-					{{ultmarc.is_pageNum_view()}}／{{ultmarc.postCnt}}
+					{{ultmarc.is_page_num_view()}}／{{ultmarc.post_cnt}}
 				</td>
 				<td class="instHeaderTd">
 					<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 8cb92402..25e55ed8 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -114,8 +114,8 @@
 	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListPocessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton">
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
-		<input type="hidden" name="instId" id="instId" value="">
-		<input type="hidden" name="pageNum" value="0">
+		<input type="hidden" name="inst_id" id="inst_id" value="">
+		<input type="hidden" name="page_num" value="0">
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -236,7 +236,7 @@
 			$('input[name="data"]:checked').each(function() {
 				vals.push( $(this).val() ); // 配列に値を追加
 			});
-			$("#instId").val(vals.join(','));
+			$("#inst_id").val(vals.join(','));
 		}
 	</script>
 </body>
diff --git a/s3/config/jskult/task_settings/web_task_settings.env b/s3/config/jskult/task_settings/web_task_settings.env
index b10c9342..9336383d 100644
--- a/s3/config/jskult/task_settings/web_task_settings.env
+++ b/s3/config/jskult/task_settings/web_task_settings.env
@@ -4,4 +4,4 @@ AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
 SESSION_EXPIRE_MINUTE=20
-SEARCH_RESULT_MAX_COUNT=500
+UTL_SEARCH_RESULT_MAX_COUNT=500

From f261cda65befba0433db776b0f1b30a22aeacf83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Fri, 16 Jun 2023 18:12:28 +0900
Subject: [PATCH 17/24] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/.env.example                |   2 +-
 ecs/jskult-webapp/src/controller/ultmarc.py   |  48 +++--
 .../src/model/request/ultmarc_doctor.py       |   7 +-
 .../src/model/request/ultmarc_inst.py         |   9 +-
 .../src/model/view/bio_view_model.py          |   2 +-
 .../view/ultmarc_doctor_info_view_model.py    |  42 +----
 .../model/view/ultmarc_doctor_view_model.py   |   8 +-
 .../view/ultmarc_inst_info_view_model.py      | 166 +-----------------
 .../src/model/view/ultmarc_inst_view_model.py |  12 +-
 .../repositories/ultmarc_inst_repository.py   |   8 +-
 .../src/services/ultmarc_view_service.py      | 101 +++++------
 .../src/system_var/environment.py             |   2 +-
 .../src/templates/bioSearchList.html          |   2 +-
 ecs/jskult-webapp/src/templates/docInfo.html  |  63 ++++---
 .../src/templates/docSearch.html              |  40 +++--
 ecs/jskult-webapp/src/templates/instInfo.html |  84 ++++-----
 .../src/templates/instSearch.html             |  32 ++--
 .../task_settings/web_task_settings.env       |   2 +-
 18 files changed, 239 insertions(+), 391 deletions(-)

diff --git a/ecs/jskult-webapp/.env.example b/ecs/jskult-webapp/.env.example
index d6fcbdcc..0630afe4 100644
--- a/ecs/jskult-webapp/.env.example
+++ b/ecs/jskult-webapp/.env.example
@@ -22,6 +22,6 @@ AWS_REGION=ap-northeast-1
 AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
-UTL_SEARCH_RESULT_MAX_COUNT=500
+ULTMARC_SEARCH_RESULT_MAX_COUNT=500
 SESSION_EXPIRE_MINUTE=20
 LOG_LEVEL=DEBUG
\ No newline at end of file
diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 00678cb0..5e9c046f 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -4,10 +4,10 @@ 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 (UltmarcDoctorInfoModel,
-                                              UltmarcDoctorSearchModel)
+from src.model.request.ultmarc_doctor import (
+    UltmarcDoctorInfoModel, UltmarcDoctorSearchModel)
 from src.model.request.ultmarc_inst import (UltmarcInstInfoModel,
-                                            UltmarcInstModel)
+                                            UltmarcInstSearchModel)
 from src.router.session_router import AuthenticatedRoute
 from src.services.batch_status_service import BatchStatusService
 from src.services.session_service import set_session
@@ -21,6 +21,10 @@ router.route_class = AuthenticatedRoute
 # Views                 #
 #########################
 
+#########################
+# アルトマーク施設検索    #
+#########################
+
 
 @router.get('/instSearch')
 def ultmarc_inst_view(
@@ -33,7 +37,7 @@ def ultmarc_inst_view(
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 検索項目の取得（都道府県・施設区分）
-    ultmarc = ultmarc_service.ultmarc_inst_view(session)
+    ultmarc = ultmarc_service.prepare_ultmarc_inst_search_view()
     ultmarc.is_batch_processing = is_batch_processing
 
     # セッション書き換え
@@ -57,7 +61,7 @@ def ultmarc_inst_view(
 @router.post('/instSearch')
 def search_inst(
     request: Request,
-    ultmarc_inst_form: Optional[UltmarcInstModel] = Depends(UltmarcInstModel.as_form),
+    ultmarc_inst_form: Optional[UltmarcInstSearchModel] = Depends(UltmarcInstSearchModel.as_form),
     ultmarc_service: UltmarcViewService = Depends(get_service(UltmarcViewService)),
     batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService))
 ):
@@ -70,7 +74,7 @@ def search_inst(
     ultmarc_inst_data = ultmarc_service.search_inst_data(ultmarc_inst_form)
 
     # 検索項目の取得（都道府県・施設区分）
-    ultmarc = ultmarc_service.ultmarc_inst_view(session)
+    ultmarc = ultmarc_service.prepare_ultmarc_inst_search_view()
     ultmarc.is_batch_processing = is_batch_processing
     ultmarc.inst_data = ultmarc_inst_data
     ultmarc.form_data = ultmarc_inst_form
@@ -92,6 +96,10 @@ def search_inst(
     )
     return templates_response
 
+#########################
+# アルトマーク施設詳細    #
+#########################
+
 
 @router.get('/instInfo')
 def ultmarc_inst_info_view(
@@ -105,8 +113,8 @@ def ultmarc_inst_info_view(
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 施設情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_inst_view(id, session)
-    # バッチ起動判定の取得
+    ultmarc = ultmarc_service.prepare_ultmarc_inst_info_view(id)
+    # バッチ起動判定
     ultmarc.is_batch_processing = is_batch_processing
     # inst_id
     ultmarc.inst_id = id
@@ -133,7 +141,7 @@ def ultmarc_inst_info_view(
     return templates_response
 
 
-@router.post('/instInfo')
+@ router.post('/instInfo')
 def ultmarc_inst_info_search(
     request: Request,
     ultmarc_inst_form: Optional[UltmarcInstInfoModel] = Depends(UltmarcInstInfoModel.as_form),
@@ -147,7 +155,7 @@ def ultmarc_inst_info_search(
     inst_id = ultmarc_inst_form.inst_id.split(',')
 
     # 施設情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_inst_view(inst_id[ultmarc_inst_form.page_num], session)
+    ultmarc = ultmarc_service.prepare_ultmarc_inst_info_view(inst_id[ultmarc_inst_form.page_num])
 
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
@@ -175,6 +183,10 @@ def ultmarc_inst_info_search(
     )
     return templates_response
 
+#########################
+# アルトマーク医師検索    #
+#########################
+
 
 @router.get('/docSearch')
 def ultmarc_doctor_view(
@@ -187,7 +199,7 @@ def ultmarc_doctor_view(
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 検索項目の取得(都道府県)
-    ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_search_view()
     ultmarc.is_batch_processing = is_batch_processing
 
     # セッション書き換え
@@ -218,14 +230,14 @@ def search_doc(
     session: UserSession = request.session
 
     # バッチ処理中ステータスを取得
-    # is_batch_processing = batch_status_service.is_batch_processing()
+    is_batch_processing = batch_status_service.is_batch_processing()
 
     # 医師データを検索
     ultmarc_doctor_data = ultmarc_service.search_doctor_data(ultmarc_doctor_form)
 
     # 検索項目などのデータを取得
-    ultmarc = ultmarc_service.prepare_ultmarc_doctor_view(session)
-    ultmarc.is_batch_processing = batch_status_service.is_batch_processing()
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_search_view()
+    ultmarc.is_batch_processing = is_batch_processing
     ultmarc.doctor_data = ultmarc_doctor_data
     ultmarc.form_data = ultmarc_doctor_form
 
@@ -246,6 +258,10 @@ def search_doc(
     )
     return templates_response
 
+#########################
+# アルトマーク医師詳細    #
+#########################
+
 
 @router.get('/docInfo')
 def ultmarc_doctor_info_view(
@@ -259,7 +275,7 @@ def ultmarc_doctor_info_view(
     is_batch_processing = batch_status_service.is_batch_processing()
 
     # 医師情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_doctor_view(id, session)
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_info_view(id)
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
     # doc_id
@@ -301,7 +317,7 @@ def ultmarc_doctor_info_search(
     doc_id = ultmarc_doctor_form.doc_id.split(',')
 
     # 医師情報の取得
-    ultmarc = ultmarc_service.info_ultmarc_doctor_view(doc_id[ultmarc_doctor_form.page_num], session)
+    ultmarc = ultmarc_service.prepare_ultmarc_doctor_info_view(doc_id[ultmarc_doctor_form.page_num])
     # バッチ起動判定の取得
     ultmarc.is_batch_processing = is_batch_processing
     # doc_id
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
index 135869b9..e1fd6224 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -19,6 +19,7 @@ class UltmarcDoctorSearchModel(BaseModel):
     trt_course_name: Optional[str]
     alma: Optional[str]
     grad_y: Optional[str]
+    pagination_pageNumber: Optional[int]
 
     @classmethod
     def as_form(
@@ -33,7 +34,8 @@ class UltmarcDoctorSearchModel(BaseModel):
         ctrl_blng_sec_name: str = Form(None),
         ctrl_trt_course_name: str = Form(None),
         ctrl_alma: str = Form(None),
-        ctrl_grad_y: str = Form(None)
+        ctrl_grad_y: str = Form(None),
+        pagination_pageNumber: str = Form(None)
     ):
 
         return cls(
@@ -47,7 +49,8 @@ class UltmarcDoctorSearchModel(BaseModel):
             blng_sec_name=ctrl_blng_sec_name,
             trt_course_name=ctrl_trt_course_name,
             alma=ctrl_alma,
-            grad_y=ctrl_grad_y
+            grad_y=ctrl_grad_y,
+            pagination_pageNumber=pagination_pageNumber
         )
 
 
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index 1b5972ff..8f28df30 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -7,7 +7,7 @@ from src.util.sanitize import sanitize
 
 
 @sanitize
-class UltmarcInstModel(BaseModel):
+class UltmarcInstSearchModel(BaseModel):
     dcf_dsf_inst_cd: Optional[str]
     inst_div_cd: Optional[str]
     form_inst_name_kanji: Optional[str]
@@ -17,6 +17,7 @@ class UltmarcInstModel(BaseModel):
     prefc_cd: Optional[str]
     delFlg: Optional[str]
     inst_addr: Optional[str]
+    pagination_pageNumber: Optional[int]
 
     @classmethod
     def as_form(
@@ -29,7 +30,8 @@ class UltmarcInstModel(BaseModel):
         ctrl_inst_phone_number: str = Form(None),
         ctrl_prefc_cd: str = Form(None),
         delFlg_ctrl: str = Form(None),
-        ctrl_inst_addr: str = Form(None)
+        ctrl_inst_addr: str = Form(None),
+        pagination_pageNumber: str = Form(None)
     ):
         return cls(
             dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd,
@@ -40,7 +42,8 @@ class UltmarcInstModel(BaseModel):
             inst_phone_number=ctrl_inst_phone_number,
             prefc_cd=ctrl_prefc_cd,
             delFlg=delFlg_ctrl,
-            inst_addr=ctrl_inst_addr
+            inst_addr=ctrl_inst_addr,
+            pagination_pageNumber=pagination_pageNumber
         )
 
 
diff --git a/ecs/jskult-webapp/src/model/view/bio_view_model.py b/ecs/jskult-webapp/src/model/view/bio_view_model.py
index 70017932..8f5e4875 100644
--- a/ecs/jskult-webapp/src/model/view/bio_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py
@@ -127,7 +127,7 @@ class BioViewModel(BaseModel):
         return len(self.bio_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.bio_data) >= environment.BIO_SEARCH_RESULT_MAX_COUNT
+        return len(self.bio_data) > environment.BIO_SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index ddbd5542..e84a3f3f 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -27,42 +27,6 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     post_cnt: Optional[int]
     page_num: Optional[int]
 
-    # 医師コード
-    def is_input_dcf_pcf_dr_cd(self):
-        return self.doctor_info_data.dcf_pcf_dr_cd or ''
-
-    # 氏名(漢字)
-    def is_input_dr_name(self):
-        return self.doctor_info_data.dr_name or ''
-
-    # 氏名(かな・カナ)
-    def is_input_dr_name_kana(self):
-        return self.doctor_info_data.dr_name_kana or ''
-
-    # 性別
-    def is_input_sex(self):
-        return self.doctor_info_data.sex or ''
-
-    # 出身大学
-    def is_input_alma(self):
-        return self.doctor_info_data.alma or ''
-
-    # 出身県
-    def is_input_hometown(self):
-        return self.doctor_info_data.hometown or ''
-
-    # 卒年
-    def is_input_grad_y(self):
-        return self.doctor_info_data.grad_y or ''
-
-    # 登録年
-    def is_input_drday_y(self):
-        return self.doctor_info_data.drday_y or ''
-
-    # 開業年
-    def is_input_estab_y(self):
-        return self.doctor_info_data.estab_y or ''
-
     # 現在のページ（表示用）
     def is_page_num_view(self):
         return self.page_num + 1
@@ -77,6 +41,7 @@ class UltmarcDoctorInfoViewModel(BaseModel):
             return 'disabled'
         return ''
 
+    # 生年月日
     def is_input_birthday_fromat(self):
         return self._format_date_string(self.doctor_info_data.birthday)
 
@@ -88,9 +53,6 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     def is_input_trt_course_data_size(self):
         return len(self.trt_coursed_data)
 
-    def is_data_string_empty_fromat(self, data_string):
-        return data_string or ''
-
     def disabled_button(self):
         return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
 
@@ -101,7 +63,7 @@ class UltmarcDoctorInfoViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT
 
     def _format_date_string(self, date_string):
         if date_string is None:
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index a97956fd..0cb0123d 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -21,6 +21,12 @@ class UltmarcDoctorViewModel(BaseModel):
             return obj.isoformat() if hasattr(obj, 'isoformat') else obj
         return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
 
+    # ページネーションのページ番号
+    def is_input_pagination_pageNumber(self):
+        if not self.is_form_submitted():
+            return 1
+        return self.form_data.pagination_pageNumber or 1
+
     # 医師コード
     def is_input_dcf_pcf_dr_cd(self):
         if not self.is_form_submitted():
@@ -102,7 +108,7 @@ class UltmarcDoctorViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
index 7caad57b..4244bef4 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_info_view_model.py
@@ -17,171 +17,30 @@ class UltmarcInstInfoViewModel(BaseModel):
     post_cnt: Optional[int]
     page_num: Optional[int]
 
-    # 施設コード
-    def is_input_dcf_dsf_inst_cd(self):
-        return self.inst_info_data.dcf_dsf_inst_cd or ''
-
     # 未確認
     def is_checked_unconf_flg(self):
         return 'checked' if self.inst_info_data.unconf_flg == '1' else ''
 
-    # 施設コード変換先
-    def is_input_dup_opp_cd(self):
-        return self.inst_info_data.dup_opp_cd or ''
-
-    # 休院店開始年月
-    def is_input_close_start_ym(self):
-        return self.inst_info_data.close_start_ym or ''
-
     # 休院店
     def is_checked_close_flg(self):
         return 'checked' if self.inst_info_data.close_flg == '1' else ''
 
-    # 削除予定理由
-    def is_input_delete_sche_reason_cd(self):
-        return self.inst_info_data.delete_sche_reason_cd or ''
-
-    def is_input_delete_sche_reason(self):
-        return self.inst_info_data.delete_sche_reason or ''
-
-    # 削除日
-    def is_input_abolish_ymd(self):
-        return self.inst_info_data.abolish_ymd or ''
-
-    # 開業予定年月
-    def is_input_estab_sche_ym(self):
-        return self.inst_info_data.estab_sche_ym or ''
-
     # 開業
     def is_checked_estab_sche_flg(self):
         return 'checked' if self.inst_info_data.estab_sche_flg == '1' else ''
 
-    # 正式施設名(カナ)
-    def is_input_form_inst_name_kana(self):
-        return self.inst_info_data.form_inst_name_kana or ''
-
-    # 正式施設名(漢字)
-    def is_input_form_inst_name_kanji(self):
-        return self.inst_info_data.form_inst_name_kanji or ''
-
-    # 略式施設名(カナ)
-    def is_input_inst_name_kana(self):
-        return self.inst_info_data.inst_name_kana or ''
-
-    # 施設区分名
-    def is_input_inst_div_name(self):
-        return self.inst_info_data.inst_div_name or ''
-
-    # 略式施設名(漢字)
-    def is_input_inst_name_kanji(self):
-        return self.inst_info_data.inst_name_kanji or ''
-
-    # 経営体
-    def is_input_manage_cd(self):
-        return self.inst_info_data.manage_cd or ''
-
-    def is_input_manage_name(self):
-        return self.inst_info_data.manage_name or ''
-
-    # 郵便番号
-    def is_input_postal_number(self):
-        return self.inst_info_data.postal_number or ''
-
     # 住所不明
     def is_checked_addr_unknown_reason_cd(self):
         return 'checked' if self.inst_info_data.addr_unknown_reason_cd else ''
 
-    # 施設電話番号
-    def is_input_inst_phone_number(self):
-        return self.inst_info_data.inst_phone_number or ''
-
     # 開業
     def is_checked_phone_number_non_flg(self):
         return 'checked' if self.inst_info_data.phone_number_non_flg == '1' else ''
 
-    # 住所（カナ）
-    def is_input_inst_addr_kana(self):
-        return self.inst_info_data.inst_addr_kana or ''
-
-    # 住所（漢字）
-    def is_input_inst_addr(self):
-        return self.inst_info_data.inst_addr or ''
-
-    # 病院種別
-    def is_input_hp_assrt_name(self):
-        return self.inst_info_data.hp_assrt_name or ''
-
     # 再審査区分
     def is_checked_re_exam_cd(self):
         return 'checked' if self.inst_info_data.re_exam_cd else ''
 
-    # 関連大学親名
-    def is_input_rltd_univ_prnt_cd(self):
-        return self.inst_info_data.rltd_univ_prnt_cd or ''
-
-    def is_input_parent_name(self):
-        return self.inst_info_data.parent_name or ''
-
-    # 微生物
-    def is_input_insp_item_micrb(self):
-        return self.inst_info_data.insp_item_micrb or ''
-
-    # 血清
-    def is_input_insp_item_serum(self):
-        return self.inst_info_data.insp_item_serum or ''
-
-    # 血液
-    def is_input_insp_item_blood(self):
-        return self.inst_info_data.insp_item_blood or ''
-
-    # 病理
-    def is_input_insp_item_patho(self):
-        return self.inst_info_data.insp_item_patho or ''
-
-    # 寄生虫
-    def is_input_insp_item_paras(self):
-        return self.inst_info_data.insp_item_paras or ''
-
-    # 生化
-    def is_input_insp_item_biochem(self):
-        return self.inst_info_data.insp_item_biochem or ''
-
-    # RI
-    def is_input_insp_item_ri(self):
-        return self.inst_info_data.insp_item_ri or ''
-
-    # 特務医務室
-    def is_input_dcf_prnt_inst_cd(self):
-        return self.inst_info_data.dcf_prnt_inst_cd or ''
-
-    # 一般
-    def is_input_prmit_bed_num_gen(self):
-        return self.inst_info_data.prmit_bed_num_gen or ''
-
-    # 療養
-    def is_input_prmit_bed_num_rcup(self):
-        return self.inst_info_data.prmit_bed_num_rcup or ''
-
-    # 精神
-    def is_input_prmit_bed_num_mental(self):
-        return self.inst_info_data.prmit_bed_num_mental or ''
-
-    # 感染症
-    def is_input_prmit_bed_num_infection(self):
-        return self.inst_info_data.prmit_bed_num_infection or ''
-
-    # 結核
-    def is_input_prmit_bed_num_tuber(self):
-        return self.inst_info_data.prmit_bed_num_tuber or ''
-
-    # その他
-    def is_input_prmit_bed_num_other(self):
-        return self.inst_info_data.prmit_bed_num_other or ''
-
-    # 合計
-    def is_input_prmit_bed_num_sum(self):
-        return self.inst_info_data.prmit_bed_num_sum or ''
-
     # 病棟閉鎖　　
     def is_checked_ward_abolish_flg(self):
         return 'checked' if self.inst_info_data.ward_abolish_flg == '1' else ''
@@ -190,26 +49,6 @@ class UltmarcInstInfoViewModel(BaseModel):
     def is_checked_ward_abolish_flg_part(self):
         return 'checked' if self.inst_info_data.ward_abolish_flg == '2' else ''
 
-    # 病床数(定員)
-    def is_input_bed_num(self):
-        return self.inst_info_data.bed_num or ''
-
-    # メンテ年月日
-    def is_input_prmit_bed_maint_ymd(self):
-        return self.inst_info_data.prmit_bed_maint_ymd or ''
-
-    # 代表者個人コード
-    def is_input_inst_repre_cd(self):
-        return self.inst_info_data.inst_repre_cd or ''
-
-    # 施設代表者(カナ)
-    def is_input_inst_repre_kana(self):
-        return self.inst_info_data.inst_repre_kana or ''
-
-    # 施設代表者(漢字)
-    def is_input_inst_repre(self):
-        return self.inst_info_data.inst_repre or ''
-
     # 修正年月日
     def is_input_sys_update_date(self):
         sys_update_date = str(self.inst_info_data.sys_update_date)
@@ -239,9 +78,6 @@ class UltmarcInstInfoViewModel(BaseModel):
             return 0
         return len(self.inst_trt_coursed_data)
 
-    def is_data_string_empty_fromat(self, data_string):
-        return data_string or ''
-
     def disabled_button(self):
         return 'disabled' if self.is_data_empty() or self.is_data_overflow_max_length() else ''
 
@@ -252,4 +88,4 @@ class UltmarcInstInfoViewModel(BaseModel):
         return len(self.doctor_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.doctor_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
+        return len(self.doctor_data) > environment.ULTMARC_SEARCH_RESULT_MAX_COUNT
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
index f98794d3..6215f8bf 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -6,7 +6,7 @@ from pydantic import BaseModel
 from src.model.db.inst_div_master import InstDivMasterModel
 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.model.request.ultmarc_inst import UltmarcInstSearchModel
 from src.system_var import environment
 
 
@@ -16,13 +16,19 @@ class UltmarcInstViewModel(BaseModel):
     prefc_models: list[PrefcMasterModel]
     inst_div_models: list[InstDivMasterModel]
     inst_data: Optional[list[UltmarcInstDBModel]] = []
-    form_data: Optional[UltmarcInstModel]
+    form_data: Optional[UltmarcInstSearchModel]
 
     def ultmarc_data_json_str(self):
         def date_handler(obj):
             return obj.isoformat() if hasattr(obj, 'isoformat') else obj
         return json.dumps([model.dict() for model in self.inst_data], ensure_ascii=False, default=date_handler)
 
+    # ページネーションのページ番号
+    def is_input_pagination_pageNumber(self):
+        if not self.is_form_submitted():
+            return 1
+        return self.form_data.pagination_pageNumber or 1
+
     # ULT施設コード
     def is_input_dcf_dsf_inst_cd(self):
         if not self.is_form_submitted():
@@ -102,7 +108,7 @@ class UltmarcInstViewModel(BaseModel):
         return len(self.inst_data) == 0
 
     def is_data_overflow_max_length(self):
-        return len(self.inst_data) >= environment.UTL_SEARCH_RESULT_MAX_COUNT
+        return len(self.inst_data) >= environment.ULTMARC_SEARCH_RESULT_MAX_COUNT
 
     def _selected_value(self, form_value: str, current_value: str):
         return 'selected' if form_value == current_value else ''
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
index 2ceebd0a..95e8605c 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -2,7 +2,7 @@ from src.db import sql_condition as condition
 from src.db.sql_condition import SQLCondition
 from src.model.db.ultmarc_inst import UltmarcInstDBModel
 from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel
-from src.model.request.ultmarc_inst import UltmarcInstModel
+from src.model.request.ultmarc_inst import UltmarcInstSearchModel
 from src.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
 
@@ -30,11 +30,11 @@ class UltmarcInstRepository(BaseRepository):
     \
     """
 
-    def fetch_many(self, parameter: UltmarcInstModel) -> list[UltmarcInstDBModel]:
+    def fetch_many(self, parameter: UltmarcInstSearchModel) -> list[UltmarcInstDBModel]:
         try:
             self._database.connect()
             # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。
-            clone_parameter = UltmarcInstModel(**parameter.dict())
+            clone_parameter = UltmarcInstSearchModel(**parameter.dict())
             where_clause = self.__build_condition(clone_parameter)
             query = self.FETCH_SQL.format(where_clause=where_clause)
             result = self._database.execute_select(query, clone_parameter.dict())
@@ -48,7 +48,7 @@ class UltmarcInstRepository(BaseRepository):
         finally:
             self._database.disconnect()
 
-    def __build_condition(self, parameter: UltmarcInstModel):
+    def __build_condition(self, parameter: UltmarcInstSearchModel):
         where_clauses: list[SQLCondition] = []
 
         # ULT施設コード
diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
index 44f99cda..5c441421 100644
--- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py
+++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py
@@ -1,7 +1,6 @@
 from src.aws.aws_api_client import AWSAPIClient
-from src.model.internal.session import UserSession
 from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
-from src.model.request.ultmarc_inst import UltmarcInstModel
+from src.model.request.ultmarc_inst import UltmarcInstSearchModel
 from src.model.view.ultmarc_doctor_info_view_model import \
     UltmarcDoctorInfoViewModel
 from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel
@@ -66,10 +65,13 @@ class UltmarcViewService(BaseService):
         self.ultmarc_doctor_wrkplace_his_repository = repositories['ultmarc_doctor_wrkplace_his_repository']
         self.ultmarc_specialist_license_repository = repositories['ultmarc_specialist_license_repository']
 
-    def prepare_ultmarc_doctor_view(
-        self,
-        session: UserSession
+    #########################
+    # アルトマーク医師       #
+    #########################
+    def prepare_ultmarc_doctor_search_view(
+        self
     ) -> UltmarcDoctorViewModel:
+        # 医師一覧画面の表示データ取得
         # 都道府県リストを取得
         prefcs = self.prefc_repository.fetch_all()
 
@@ -78,58 +80,15 @@ class UltmarcViewService(BaseService):
         )
         return ultmarc
 
-    def ultmarc_inst_view(
-        self,
-        session: UserSession
-    ) -> UltmarcInstViewModel:
-        # 都道府県リストを取得
-        prefcs = self.prefc_repository.fetch_all()
-        # 施設区分リストを取得
-        inst_div = self.inst_div_repository.fetch_all()
-
-        ultmarc = UltmarcInstViewModel(
-            prefc_models=prefcs,
-            inst_div_models=inst_div
-        )
-        return ultmarc
-
-    def search_inst_data(self, search_params: UltmarcInstModel):
-        # 施設データを検索
-        ultmarc_inst_data = self.ultmarc_inst_repository.fetch_many(parameter=search_params)
-        return ultmarc_inst_data
-
-    def info_ultmarc_inst_view(
-        self,
-        id,
-        session: UserSession
-    ) -> UltmarcInstInfoViewModel:
-
-        # 施設情報画面の表示データ取得
-        # 施設情報を取得
-        inst_info = self.ultmarc_inst_repository.fetch_one(id)
-        # 診療科目情報を取得
-        inst_trt_course = self.ultmarc_inst_trt_course_repository.fetch_many(id)
-        # 医師件数を取得
-        doctor_count = self.ultmarc_doctor_wrkplace_repository.fetch_count(id)
-
-        ultmarc = UltmarcInstInfoViewModel(
-            inst_info_data=inst_info,
-            inst_trt_coursed_data=inst_trt_course,
-            doctor_wrkplace_count=doctor_count
-        )
-        return ultmarc
-
     def search_doctor_data(self, search_params: UltmarcDoctorSearchModel):
         # 医師データを検索
         ultmarc_doctor_data = self.ultmarc_doctor_repository.fetch_many(parameter=search_params)
         return ultmarc_doctor_data
 
-    def info_ultmarc_doctor_view(
+    def prepare_ultmarc_doctor_info_view(
         self,
-        id,
-        session: UserSession
+        id
     ) -> UltmarcDoctorInfoViewModel:
-
         # 医師情報画面の表示データ取得
         # 医師情報を取得
         doctor_info = self.ultmarc_doctor_repository.fetch_one(id)
@@ -153,3 +112,45 @@ class UltmarcViewService(BaseService):
             doctor_wrkplace_his_data=wrkplace_his
         )
         return ultmarc
+
+    #########################
+    # アルトマーク施設       #
+    #########################
+    def prepare_ultmarc_inst_search_view(
+        self
+    ) -> UltmarcInstViewModel:
+        # 施設一覧画面の表示データ取得
+        # 都道府県リストを取得
+        prefcs = self.prefc_repository.fetch_all()
+        # 施設区分リストを取得
+        inst_div = self.inst_div_repository.fetch_all()
+
+        ultmarc = UltmarcInstViewModel(
+            prefc_models=prefcs,
+            inst_div_models=inst_div
+        )
+        return ultmarc
+
+    def search_inst_data(self, search_params: UltmarcInstSearchModel):
+        # 施設データを検索
+        ultmarc_inst_data = self.ultmarc_inst_repository.fetch_many(parameter=search_params)
+        return ultmarc_inst_data
+
+    def prepare_ultmarc_inst_info_view(
+        self,
+        id
+    ) -> UltmarcInstInfoViewModel:
+        # 施設情報画面の表示データ取得
+        # 施設情報を取得
+        inst_info = self.ultmarc_inst_repository.fetch_one(id)
+        # 診療科目情報を取得
+        inst_trt_course = self.ultmarc_inst_trt_course_repository.fetch_many(id)
+        # 医師件数を取得
+        doctor_count = self.ultmarc_doctor_wrkplace_repository.fetch_count(id)
+
+        ultmarc = UltmarcInstInfoViewModel(
+            inst_info_data=inst_info,
+            inst_trt_coursed_data=inst_trt_course,
+            doctor_wrkplace_count=doctor_count
+        )
+        return ultmarc
diff --git a/ecs/jskult-webapp/src/system_var/environment.py b/ecs/jskult-webapp/src/system_var/environment.py
index 91b661b3..c5bf66ef 100644
--- a/ecs/jskult-webapp/src/system_var/environment.py
+++ b/ecs/jskult-webapp/src/system_var/environment.py
@@ -19,7 +19,7 @@ DB_PASSWORD = os.environ['DB_PASSWORD']
 DB_SCHEMA = os.environ['DB_SCHEMA']
 
 BIO_SEARCH_RESULT_MAX_COUNT = int(os.environ['BIO_SEARCH_RESULT_MAX_COUNT'])
-UTL_SEARCH_RESULT_MAX_COUNT = int(os.environ['UTL_SEARCH_RESULT_MAX_COUNT'])
+ULTMARC_SEARCH_RESULT_MAX_COUNT = int(os.environ['ULTMARC_SEARCH_RESULT_MAX_COUNT'])
 SESSION_EXPIRE_MINUTE = int(os.environ['SESSION_EXPIRE_MINUTE'])
 
 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO')
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index 2ab9b7cb..32ca883a 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -176,7 +176,7 @@
             </table>
             {% if bio.is_form_submitted() and bio.is_data_overflow_max_length() %}
             <div class="resultAreaMsg">
-                検索件数が500件を超えています 検索項目を見直してください
+                検索結果が最大件数を超えました。検索条件を見直しして下さい。
             </div>
             {% endif %}
             {% if bio.is_form_submitted() and bio.is_data_empty() %}
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index 1a40192b..ca70b292 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -84,30 +84,30 @@
 		<tbody>
 			<tr>
 				<td class="docInfoTd">医師コード:</td>
-				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_pcf_dr_cd()}}"></td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.dcf_pcf_dr_cd or ''}}"></td>
 				<td>氏名(漢字):</td>
-				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dr_name()}}"></td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.dr_name or ''}}"></td>
 				<td>氏名(カナ):</td>
-				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_dr_name_kana()}}"></td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.dr_name_kana or ''}}"></td>
 			</tr>
 			<tr>
 				<td class="docInfoTd">性別：</td>
-				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_sex()}}"></td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.sex or ''}}"></td>
 				<td>生年月日:</td>
 				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_fromat()}}"></td>
 			</tr>
 			<tr>
 				<td colspan="6" class="docInfoTd">
 					出身大学:
-					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_alma()}}">
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.alma or ''}}">
 					出身県:
-					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_hometown()}}">
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.hometown or ''}}">
 					卒年:
-					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_grad_y()}}">
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.grad_y or ''}}">
 					登録年:
-					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_drday_y()}}">
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.drday_y or ''}}">
 					開業年:
-					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.is_input_estab_y()}}">
+					<input class="docInfoTextBox" type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.estab_y or ''}}">
 				</td>
 			</tr>
 
@@ -141,8 +141,8 @@
 							<tbody>
 								{% for sosiety_data in ultmarc.sosiety_data %}
 									<tr>
-										<td>{{ultmarc.is_data_string_empty_fromat(sosiety_data.sosiety_cd)}}</td>
-										<td>{{ultmarc.is_data_string_empty_fromat(sosiety_data.sosiety_name)}}</td>
+										<td>{{sosiety_data.sosiety_cd or ''}}</td>
+										<td>{{sosiety_data.sosiety_name or ''}}</td>
 									</tr>
 								{% endfor %}
 							</tbody>
@@ -162,8 +162,8 @@
 							<tbody>
 								{% for specialist_license_data in ultmarc.specialist_license_data %}
 									<tr>
-										<td>{{ultmarc.is_data_string_empty_fromat(specialist_license_data.specialist_cd)}}</td>
-										<td>{{ultmarc.is_data_string_empty_fromat(specialist_license_data.specialist_license_name)}}</td>
+										<td>{{specialist_license_data.specialist_cd or ''}}</td>
+										<td>{{specialist_license_data.specialist_license_name or ''}}</td>
 									</tr>
 								{% endfor %}
 							</tbody>
@@ -176,7 +176,7 @@
 	<!-- 勤務先履歴 -->
 	<h1 class="wrkplaceH1">勤務先履歴</h1>
 	<div class="scroll">
-    	<table class="tablesorter wrkplaceTable" _fixedhead='rows:1; cols:0; border-color:gray; border-width:2px;'>
+		<table class="tablesorter wrkplaceTable" _fixedhead='rows:1; cols:0; border-color:gray; border-width:2px;'>
 			<thead>
 				<tr>
 					<th>ULT施設コード</th>
@@ -196,31 +196,30 @@
 			</script>
 			<tbody>
 				{% for doctor_wrkplace_data in ultmarc.doctor_wrkplace_data %}
-				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd) != ''%}
+				{% if doctor_wrkplace_data.dcf_dsf_inst_cd %}
 					<tr>
-						<td><a href="/ultmarc/instInfo?id={{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}" onclick="OnLinkClick();">
-							{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.dcf_dsf_inst_cd)}}</a></td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.inst_name_kanji)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.blng_sec_name)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.univ_post_name)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_data.post_name)}}</td>
-						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_data.aply_start_ymd)}}</td>
+						<td><a href="/ultmarc/instInfo?id={{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}}" onclick="OnLinkClick();">
+							{{doctor_wrkplace_data.dcf_dsf_inst_cd or ''}}</a></td>
+						<td>{{doctor_wrkplace_data.inst_name_kanji or ''}}</td>
+						<td>{{doctor_wrkplace_data.blng_sec_name or ''}}</td>
+						<td>{{doctor_wrkplace_data.univ_post_name or ''}}</td>
+						<td>{{doctor_wrkplace_data.post_name or ''}}</td>
+						<td>{{doctor_wrkplace_data.aply_start_ymd or ''}}</td>
 						<td>9999/99/99</td>
 					</tr>
 				{% endif %}
 				{% endfor %}
 				{% for doctor_wrkplace_his_data in ultmarc.doctor_wrkplace_his_data %}
-				{% if ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd) != ''%}
+				{% if doctor_wrkplace_his_data.dcf_dsf_inst_cd %}
 					<tr>
-						<td><a href="/ultmarc/instInfo?id={{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}" onclick="OnLinkClick();">
-							{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.dcf_dsf_inst_cd)}}
-						</a></td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.inst_name_kanji)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.blng_sec_name)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.univ_post_name)}}</td>
-						<td>{{ultmarc.is_data_string_empty_fromat(doctor_wrkplace_his_data.post_name)}}</td>
-						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_his_data.aply_start_ymd)}}</td>
-						<td>{{ultmarc.is_input_ymd_fromat(doctor_wrkplace_his_data.aply_end_ymd)}}</td>
+						<td><a href="/ultmarc/instInfo?id={{doctor_wrkplace_his_data.dcf_dsf_inst_cd or ''}}" onclick="OnLinkClick();">
+							{{doctor_wrkplace_his_data.dcf_dsf_inst_cd or ''}}</a></td>
+						<td>{{doctor_wrkplace_his_data.inst_name_kanji or ''}}</td>
+						<td>{{doctor_wrkplace_his_data.blng_sec_name or ''}}</td>
+						<td>{{doctor_wrkplace_his_data.univ_post_name or ''}}</td>
+						<td>{{doctor_wrkplace_his_data.post_name or ''}}</td>
+						<td>{{doctor_wrkplace_his_data.aply_start_ymd or ''}}</td>
+						<td>{{doctor_wrkplace_his_data.aply_end_ymd or ''}}</td>
 					</tr>
 				{% endif %}
 				{% endfor %}
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 3d532374..1654f1eb 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -111,11 +111,12 @@
 	</form>
 	
 	<!--検索結果-->
-	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListPocessing()">
+	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListProcessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
 		<input type="hidden" name="doc_id" id="doc_id" value="">
 		<input type="hidden" name="page_num" value="0">
+
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -140,7 +141,7 @@
 			</table>
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
 			<div class="resultAreaMsg">
-				検索結果が最大件数を超えました。検索条件を見直しして下さい。
+				検索件数が500件を超えています 検索項目を見直してください
 			</div>
 			{% endif %}
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
@@ -157,14 +158,15 @@
 	<script type="text/javascript">
         // <! --ページネーションの作成-- >
         $(function() {
-            // スピナー出さない場合は以下、エスケープせず埋め込む
-            // {% autoescape False%}
-            let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
-            // {% endautoescape%}
-            const searchResultData = JSON.parse(searchResultString)
-            if(searchResultData.length > 500){
-				return
-			}
+			let searchResultData = [];
+			// {% if not ultmarc.is_data_overflow_max_length() and  not ultmarc.is_data_empty()  %}
+				// スピナー出さない場合は以下、エスケープせず埋め込む	
+				// {% autoescape False%}
+				const searchResultString = '{{ultmarc.ultmarc_data_json_str()}}';
+				// {% endautoescape%}
+				searchResultData = JSON.parse(searchResultString);			
+			// {% endif %}
+
 			// 検索条件をセッションに入れる
 			sessionStorage.clear();
 			sessionStorage.setItem('ctrl_dcf_pcf_dr_cd','{{ultmarc.is_input_dcf_pcf_dr_cd()}}');
@@ -178,21 +180,25 @@
 			sessionStorage.setItem('ctrl_trt_course_name','{{ultmarc.is_input_trt_course_name()}}');
 			sessionStorage.setItem('ctrl_alma','{{ultmarc.is_input_alma()}}');
 			sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}');
+			
+			// ページネーションのページ番号取得
+			let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
 
 			$(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
                 },
-                pageNumber: 1, // 初期ページ番号
+                pageNumber: pagination_pageNumber, // 初期ページ番号
                 pageSize: 50, //表示するコンテンツ数
-                pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
+                pageRange: 1, //選択されているページネーション番号の両隣に表示する個数
                 ellipsisText: '...', //省略文字
                 prevText: 'Prev', //「前へ」の文字。エスケープ文字
                 nextText: 'Next', //「次へ」の文字。エスケープ文字
                 showNavigator: true,
                 formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
                 callback: function(data, pagination) {
-                    $('#result_data').html(pagination_content(data))
+					sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
+                    $('#result_data').html(pagination_content(data));
                 }
             })
         });
@@ -213,7 +219,7 @@
 				'alma',
 				'grad_y'
             ];
-			return datas.map(function (data, index) {
+			return datas.map(function (data) {
 				let td = display_keys.map((key) =>{
 					let inner_content = data[key];
 					if(key=='dcf_pcf_dr_cd')
@@ -235,10 +241,10 @@
 			})
 		}
 
-		配列パラメータを加工にする
-		function CheckBoxListPocessing()
+		// 検索結果のうち、チェックされている行のデータを非表示項目に詰め込む
+		function CheckBoxListProcessing()
 		{
-			var vals = []; // 配列を定義
+			let vals = []; // 配列を定義
 			$('input[name="data"]:checked').each(function() {
 				vals.push( $(this).val() ); // 配列に値を追加
 			});
diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html
index b582b54d..368b6394 100644
--- a/ecs/jskult-webapp/src/templates/instInfo.html
+++ b/ecs/jskult-webapp/src/templates/instInfo.html
@@ -43,7 +43,7 @@
 		<tr>
 			<form name="docSearch" method="post" action="/ultmarc/docSearch">
 				<td class="instHeaderTd">
-					<input type="hidden" name="ctrl_dcf_dsf_inst_cd" value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}">
+					<input type="hidden" name="ctrl_dcf_dsf_inst_cd" value="{{ultmarc.inst_info_data.dcf_dsf_inst_cd or ''}}">
 					<input name="docSearchBt" class="transitionBt" type="submit" value="勤務医師" {{ultmarc.is_disabled_doctor_wrkplace()}}>
 				</td>
 			</form>
@@ -98,74 +98,76 @@
 			<tr>
 				<td class="instInfoColumn">施設コード</td>
 				<td class="instData instDataLeft">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" class="instCdTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.dcf_dsf_inst_cd or ''}}" class="instCdTextbox">
 					<input class="checkbox" type="checkbox" disabled="disabled" {{ultmarc.is_checked_unconf_flg()}}>未確認
 				</td>
 				<td class="instInfoColumn">施設コード変換先</td>
 				<td class="instData instDataCenter">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_dup_opp_cd()}}" class="instDataCenterTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.dup_opp_cd or ''}}" class="instDataCenterTextbox">
 				</td>
 				<td class="instInfoColumn">休院店開始年月</td>
 				<td class="instData instDataRight">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_close_start_ym()}}" class="instDataSmallTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.close_start_ym or ''}}" class="instDataSmallTextbox">
 					<input type="checkbox" disabled="disabled" {{ultmarc.is_checked_close_flg()}}>休院店
 				</td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">削除予定理由</td>
-				<td class="instData instDataLeft"><input type="text" readonly="readonly" value="{{ultmarc.is_input_delete_sche_reason_cd()}}" class="delReasonCdTextbox"><input type="text" readonly="readonly" value="{{ultmarc.is_input_delete_sche_reason()}}" class="delReasonTextbox"></td>
+				<td class="instData instDataLeft">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.delete_sche_reason_cd or ''}}" class="delReasonCdTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.delete_sche_reason or ''}}" class="delReasonTextbox"></td>
 				<td class="instInfoColumn">削除日</td>
 				<td class="instData instDataCenter">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_abolish_ymd()}}" class="instDataCenterTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.abolish_ymd or ''}}" class="instDataCenterTextbox">
 				</td>
 				<td class="instInfoColumn">開業予定年月</td>
 				<td class="instData instDataRight">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_estab_sche_ym()}}" class="instDataSmallTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.estab_sche_ym or ''}}" class="instDataSmallTextbox">
 					<input type="checkbox" disabled="disabled" {{ultmarc.is_checked_estab_sche_flg()}}>開業
 				</td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">正式施設名(カナ)</td>
-				<td class="instData"  colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_form_inst_name_kana()}}" class="instInfoTextbox"></td>
+				<td class="instData"  colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.form_inst_name_kana or ''}}" class="instInfoTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">正式施設名(漢字)</td>
-				<td class="instData" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_form_inst_name_kanji()}}" class="instInfoTextbox"></td>
+				<td class="instData" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.form_inst_name_kanji or ''}}" class="instInfoTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">略式施設名(カナ)</td>
-				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_name_kana()}}" class="instInfoTextbox"></td>
+				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_name_kana or ''}}" class="instInfoTextbox"></td>
 				<td class="instInfoColumn">施設区分名</td>
-				<td class="instData instDataSmall"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_div_name()}}" class="instInfoTextbox"></td>
+				<td class="instData instDataSmall"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_div_name or ''}}" class="instInfoTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">略式施設名(漢字)</td>
-				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_name_kanji()}}" class="instInfoTextbox"></td>
+				<td class="instData instDataMid" colspan="3"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_name_kanji or ''}}" class="instInfoTextbox"></td>
 				<td class="instInfoColumn">経営体</td>
 				<td class="instData instDataSmall">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_manage_cd()}}" class="manageTextbox">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_manage_name()}}" class="textboxMargin manageTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.manage_cd or ''}}" class="manageTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.manage_name or ''}}" class="textboxMargin manageTextbox">
 				</td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">郵便番号</td>
 				<td class="instData instDataMid"  colspan="3">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_postal_number()}}">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.postal_number or ''}}">
 					<input type="checkbox" class="checkboxMargin" disabled="disabled" {{ultmarc.is_checked_addr_unknown_reason_cd()}}>住所不明
 				</td>
 				<td class="instInfoColumn">施設電話番号</td>
 				<td class="instData instDataRight">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_phone_number()}}" class="instDataSmallTextbox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_phone_number or ''}}" class="instDataSmallTextbox">
 					<input type="checkbox" class="checkboxMargin" disabled="disabled" {{ultmarc.is_checked_phone_number_non_flg()}}>電話なし
 				</td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">住所（カナ）</td>
-				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_addr_kana()}}" class="instInfoTextbox"></td>
+				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_addr_kana or ''}}" class="instInfoTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">住所（漢字）</td>
-				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_addr()}}" class="instInfoTextbox"></td>
+				<td class="instData instDataLarge" colspan="5"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_addr or ''}}" class="instInfoTextbox"></td>
 			</tr>
 		</tbody>
 	</table>
@@ -177,12 +179,12 @@
 		<tbody>
 			<tr>
 				<td class="hpInfoColumn">病院種別</td>
-				<td class="instData hpAssrtTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_hp_assrt_name()}}" class="hpAssrtTextbox"></td>
+				<td class="instData hpAssrtTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.hp_assrt_name or ''}}" class="hpAssrtTextbox"></td>
 				<td class="instData reExamTd"><input type="checkbox" disabled="disabled" {{ultmarc.is_checked_re_exam_cd()}}>再審査区分</input></td>
 				<td class="hpInfoColumn">関連大学親名</td>
 				<td class="instData">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_rltd_univ_prnt_cd()}}" class="parentCdTextBox">
-					<input type="text" readonly="readonly" value="{{ultmarc.is_input_parent_name()}}" class="parentNameTextBox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.rltd_univ_prnt_cd or ''}}" class="parentCdTextBox">
+					<input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.parent_name or ''}}" class="parentNameTextBox">
 				</td>
 			</tr>
 			<tr>
@@ -203,19 +205,19 @@
 				<td class="hpInfoColumn">検査工程</td>
 				<td class="instData" colspan="4">
 					<label>微生物</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_micrb()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_micrb or ''}}">
 					<label>血清</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_serum()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_serum or ''}}">
 					<label>血液</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_blood()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_blood or ''}}">
 					<label>病理</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_patho()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_patho or ''}}">
 					<label>寄生虫</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_paras()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_paras or ''}}">
 					<label>生化</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_biochem()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_biochem or ''}}">
 					<label>RI</label>
-					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.is_input_insp_item_ri()}}">
+					<input class="trtTextbox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.insp_item_ri or ''}}">
 				</td>
 			</tr>
 		</tbody>
@@ -224,7 +226,7 @@
 			<tbody>
 			<tr>
 				<td class="hpInfoColumn">特務医務室</td>
-				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_dcf_prnt_inst_cd()}}" class="xSmallTextbox"></td>
+				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.dcf_prnt_inst_cd or ''}}" class="xSmallTextbox"></td>
 				<td rowspan="2" class="hpInfoColumn">許可病床数</td>
 				<td class="instData bedTd" rowspan="2">
 					<table>
@@ -239,13 +241,13 @@
 								<td>合計</td>
 							</tr>
 							<tr>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_gen()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_rcup()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_mental()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_infection()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_tuber()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_other()}}"></td>
-								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_num_sum()}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_gen or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_rcup or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_mental or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_infection or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_tuber or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_other or ''}}"></td>
+								<td><input class="bedTextbox numberBox" type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_num_sum or ''}}"></td>
 							</tr>
 						</tbody>
 					</table>
@@ -254,9 +256,9 @@
 			</tr>
 			<tr>
 				<td class="hpInfoColumn">病床数(定員)</td>
-				<td class="instData"><input type="text" readonly="readonly" value="{{ultmarc.is_input_bed_num()}}" class="xSmallTextbox numberBox"></td>
+				<td class="instData"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.bed_num or ''}}" class="xSmallTextbox numberBox"></td>
 				<td class="hpInfoColumn">メンテ年月日</td>
-				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_prmit_bed_maint_ymd()}}" class="xSmallTextbox"></td>
+				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_maint_ymd or ''}}" class="xSmallTextbox"></td>
 			</tr>
 		</tbody>
 	</table>
@@ -265,15 +267,15 @@
 		<tbody>
 			<tr>
 				<td class="instInfoColumn">代表者個人コード</td>
-				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre_cd()}}" class="repreTextbox"></td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_repre_cd or ''}}" class="repreTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">施設代表者(カナ)</td>
-				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre_kana()}}" class="repreTextbox"></td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_repre_kana or ''}}" class="repreTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">施設代表者(漢字)</td>
-				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.is_input_inst_repre()}}" class="repreTextbox"></td>
+				<td class="instData repreTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.inst_repre or ''}}" class="repreTextbox"></td>
 			</tr>
 			<tr>
 				<td class="instInfoColumn">修正年月日</td>
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 25e55ed8..e630b9d8 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -111,11 +111,12 @@
 	</form>
 
 	<!--検索結果-->
-	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListPocessing()">
+	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListProcessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton">
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
 		<input type="hidden" name="inst_id" id="inst_id" value="">
 		<input type="hidden" name="page_num" value="0">
+		
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -157,13 +158,16 @@
 	<script type="text/javascript">
         // <! --ページネーションの作成-- >
         $(function() {
-			// {% autoescape False%}
-			let searchResultString = '{{ultmarc.ultmarc_data_json_str()}}'
-            // {% endautoescape%}
-            const searchResultData = JSON.parse(searchResultString)
-            if (searchResultData.length > 500) {
-				return
-            }
+
+			let searchResultData = [];
+			// {% if not ultmarc.is_data_overflow_max_length() and  not ultmarc.is_data_empty()  %}
+				// スピナー出さない場合は以下、エスケープせず埋め込む	
+				// {% autoescape False%}
+				const searchResultString = '{{ultmarc.ultmarc_data_json_str()}}';
+				// {% endautoescape%}
+				searchResultData = JSON.parse(searchResultString);			
+			// {% endif %}
+
 
 			// 検索条件をセッションに入れる
 			sessionStorage.clear();
@@ -177,11 +181,14 @@
 			sessionStorage.setItem('delFlg_ctrl','{{ultmarc.is_input_delFlg()}}');
 			sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
 
+			// ページネーションのページ番号取得
+			let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
+
             $(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
                 },
-                pageNumber: 1, // 初期ページ番号
+                pageNumber: pagination_pageNumber, // 初期ページ番号
                 pageSize: 50, //表示するコンテンツ数
                 pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
                 ellipsisText: '...', //省略文字
@@ -190,6 +197,7 @@
                 showNavigator: true,
                 formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
                 callback: function(data, pagination) {
+					sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
                     $('#result_data').html(pagination_content(data))
                 }
             })
@@ -229,10 +237,10 @@
 			})
 		}
 
-		// 配列パラメータを加工にする
-		function CheckBoxListPocessing()
+		// // 検索結果のうち、チェックされている行のデータを非表示項目に詰め込む
+		function CheckBoxListProcessing()
 		{
-			var vals = []; // 配列を定義
+			let vals = []; // 配列を定義
 			$('input[name="data"]:checked').each(function() {
 				vals.push( $(this).val() ); // 配列に値を追加
 			});
diff --git a/s3/config/jskult/task_settings/web_task_settings.env b/s3/config/jskult/task_settings/web_task_settings.env
index 9336383d..9f6b542a 100644
--- a/s3/config/jskult/task_settings/web_task_settings.env
+++ b/s3/config/jskult/task_settings/web_task_settings.env
@@ -4,4 +4,4 @@ AUTHORIZE_ENDPOINT=oauth2/authorize
 TOKEN_ENDPOINT=oauth2/token
 BIO_SEARCH_RESULT_MAX_COUNT=35000
 SESSION_EXPIRE_MINUTE=20
-UTL_SEARCH_RESULT_MAX_COUNT=500
+ULTMARC_SEARCH_RESULT_MAX_COUNT=500

From e61296dc1e49de42b650cb6a229bd202957bcf7d Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 16 Jun 2023 19:37:33 +0900
Subject: [PATCH 18/24] =?UTF-8?q?feat:=20=E3=83=9C=E3=82=BF=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E5=88=B6=E5=BE=A1=E3=82=92=E3=80=81JS=E3=81=A7?=
 =?UTF-8?q?=E3=81=AF=E3=81=AA=E3=81=8F=E3=83=A2=E3=83=87=E3=83=AB=E3=81=AE?=
 =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E8=A1=8C?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=80=82=20=E4=BF=9D=E5=AD=98=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=95=E3=82=A9=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E9=81=A9=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/templates/docInfo.html  |  2 +-
 .../src/templates/docSearch.html              | 40 +++++++++----------
 ecs/jskult-webapp/src/templates/instInfo.html |  2 +-
 .../src/templates/instSearch.html             | 30 +++++++-------
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index ca70b292..b0b0282a 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -42,7 +42,7 @@
 			<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
 		</tr>
 	</table>
-    
+
 	<!-- 上部のボタン -->
 	<table class="instHeaderTable">
 		<tr>
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 1654f1eb..e19c3a2a 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -35,34 +35,34 @@
 				<tr>
 					<td class="docSearchColumnTd">医師コード:</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd" 
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_pcf_dr_cd"
 						value="{{ultmarc.is_input_dcf_pcf_dr_cd()}}" maxlength='10' oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">氏名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name"
 						value="{{ultmarc.is_input_dr_name()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">氏名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_dr_name_kana"
 						value="{{ultmarc.is_input_dr_name_kana()}}" oninput="formBtDisabled()">
 					</td>
 				</tr>
 				<tr>
 					<td class="docSearchColumnTd">勤務先コード：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
+						<input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd"
 						value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" maxlength='11' oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">勤務先名(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kanji"
 						value="{{ultmarc.is_input_form_inst_name_kanji()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">勤務先名(かな・カナ)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_form_inst_name_kana"
 						value="{{ultmarc.is_input_form_inst_name_kana()}}" oninput="formBtDisabled()">
 					</td>
 				</tr>
@@ -74,7 +74,7 @@
 							<!-- 都道府県ドロップダウンの中身を作成 -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
-                            <option 
+                            <option
                                 value="{{prefc['prefc_cd']}}" {{ultmarc.is_selected_prefc_cd(prefc['prefc_cd'])}}>
                                 {{prefc['prefc_name']}}
                             </option>
@@ -83,23 +83,23 @@
 					</td>
 					<td class="docSearchColumnTd">所属部科(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_blng_sec_name"
 						value="{{ultmarc.is_input_blng_sec_name()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">診療科目(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_trt_course_name"
 						value="{{ultmarc.is_input_trt_course_name()}}" oninput="formBtDisabled()">
 					</td>
 				</tr>
 				<tr>
 					<td class="docSearchColumnTd">出身大学(漢字)：</td>
 					<td class="docSearchTextboxTd">
-						<input class="text docSearchTextbox" type="text" name="ctrl_alma" 
+						<input class="text docSearchTextbox" type="text" name="ctrl_alma"
 						value="{{ultmarc.is_input_alma()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="docSearchColumnTd">卒年：</td>
-					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y" 
+					<td class="docSearchTextboxTd"><input class="text docSearchTextbox" style="ime-mode:disabled;" type="text" name="ctrl_grad_y"
 						value="{{ultmarc.is_input_grad_y()}}" maxlength='4' oninput="formBtDisabled()"></td>
 					<td class="search_btTd" colspan="2">
 						<input class="text ult_bt search_bt" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();">
@@ -109,7 +109,7 @@
 			</tbody>
 		</table>
 	</form>
-	
+
 	<!--検索結果-->
 	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListProcessing()">
 		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
@@ -149,10 +149,10 @@
 				対象のデータが存在しません。
 			</div>
 			{% endif %}
-					
+
 		</div>
 		<!--操作ボタン-->
-		<input class="send ult_bt info_bt" type="submit" name="detail" value="医師情報" >
+		<input class="ult_bt info_bt" type="submit" name="detail" value="医師情報" {{ultmarc.disabled_button()}}>
 	</form>
 
 	<script type="text/javascript">
@@ -160,11 +160,11 @@
         $(function() {
 			let searchResultData = [];
 			// {% if not ultmarc.is_data_overflow_max_length() and  not ultmarc.is_data_empty()  %}
-				// スピナー出さない場合は以下、エスケープせず埋め込む	
+				// スピナー出さない場合は以下、エスケープせず埋め込む
 				// {% autoescape False%}
 				const searchResultString = '{{ultmarc.ultmarc_data_json_str()}}';
 				// {% endautoescape%}
-				searchResultData = JSON.parse(searchResultString);			
+				searchResultData = JSON.parse(searchResultString);
 			// {% endif %}
 
 			// 検索条件をセッションに入れる
@@ -180,7 +180,7 @@
 			sessionStorage.setItem('ctrl_trt_course_name','{{ultmarc.is_input_trt_course_name()}}');
 			sessionStorage.setItem('ctrl_alma','{{ultmarc.is_input_alma()}}');
 			sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}');
-			
+
 			// ページネーションのページ番号取得
 			let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
 
@@ -202,7 +202,7 @@
                 }
             })
         });
-        
+
 		function OnLinkClick(){
 			sessionStorage.clear();
 			return true;
@@ -231,13 +231,13 @@
 				return  `
 				<tr class="result_data">
 					<td><div class="checkNum">
-						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()" 
+						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()"
 						value=${data['dcf_pcf_dr_cd']}>
 					</div></td>
 					${td}
 				</tr>
 				`
-				
+
 			})
 		}
 
diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html
index 368b6394..47951590 100644
--- a/ecs/jskult-webapp/src/templates/instInfo.html
+++ b/ecs/jskult-webapp/src/templates/instInfo.html
@@ -74,7 +74,7 @@
 					}
 
 				</script>
-			
+
 				<td class="instHeaderTd">
 					<input type="submit" name="instSearchBt" class="transitionBt" value="施設検索一覧へ">
 				</td>
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index e630b9d8..5ac6c003 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -15,7 +15,7 @@
 		}
 	</script>
 </head>
-	
+
 <!--検索フォーム-->
 <body>
 	<!-- タイトルと上部ボタン -->
@@ -37,7 +37,7 @@
 				<tr>
 					<td>ULT施設コード：</td>
 					<td class="search_tb leftSearch_tb">
-						<input class="text search_textbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd" 
+						<input class="text search_textbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd"
                         value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" oninput="formBtDisabled()">
 					</td>
 					<td>施設区分：</td>
@@ -56,22 +56,22 @@
 				<tr>
 					<td>ULT施設名(漢字)：</td>
 					<td class="search_tb">
-						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kanji" 
+						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kanji"
                         value="{{ultmarc.is_input_form_inst_name_kanji()}}" oninput="formBtDisabled()">
 					</td>
 					<!-- アルトマーク課題管理表No.8の修正 （カナ）⇒(かな・カナ)-->
 					<td>ULT施設名(かな・カナ)：</td>
 					<td class="search_tb">
-						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kana" 
+						<input class="text search_textbox" type="text" name="ctrl_form_inst_name_kana"
                         value="{{ultmarc.is_input_form_inst_name_kana()}}" oninput="formBtDisabled()">
 					</td>
 				</tr>
 				<tr>
 					<td>郵便番号：</td>
-					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_postal_number" 
+					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_postal_number"
                         value="{{ultmarc.is_input_postal_number()}}" oninput="formBtDisabled()">
 					<td>電話番号：</td>
-					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_inst_phone_number" 
+					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_inst_phone_number"
                         value="{{ultmarc.is_input_inst_phone_number()}}" oninput="formBtDisabled()">
                     </td>
 				</tr>
@@ -83,7 +83,7 @@
 							<!-- 都道府県ドロップダウンの中身を作成 -->
 							<option value=""></option>
                             {% for prefc in ultmarc.prefc_models %}
-                            <option 
+                            <option
                                 value="{{prefc['prefc_cd']}}" {{ultmarc.is_selected_prefc_cd(prefc['prefc_cd'])}}>
                                 {{prefc['prefc_name']}}
                             </option>
@@ -91,14 +91,14 @@
 						</select>
 					</td>
 					<td>
-						<label><input type="checkbox" name="delFlg_ctrl" value="true" 
+						<label><input type="checkbox" name="delFlg_ctrl" value="true"
 							{{ultmarc.is_checked_delFlg()}}> 削除施設表示</label>
 					</td>
 				</tr>
 				<tr>
 					<td>ULT施設住所：</td>
 					<td class="search_tb">
-						<input class="text search_textbox" type="text" name="ctrl_inst_addr" 
+						<input class="text search_textbox" type="text" name="ctrl_inst_addr"
                         value="{{ultmarc.is_input_inst_addr()}}" oninput="formBtDisabled()">
 					</td>
 					<td class="search_btTd" colspan="2">
@@ -116,7 +116,7 @@
 		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
 		<input type="hidden" name="inst_id" id="inst_id" value="">
 		<input type="hidden" name="page_num" value="0">
-		
+
 		<!--検索件数-->
 		<!--ページネーション-->
 		<div id="light-pagination" class="pagination"></div>
@@ -152,7 +152,7 @@
 			</div>
 
 		<!--操作ボタン-->
-		<input class="send ult_bt info_bt" type="submit" name="detail" value="施設情報">
+		<input class="ult_bt info_bt" type="submit" name="detail" value="施設情報" {{ultmarc.disabled_button()}}>
 	</form>
 
 	<script type="text/javascript">
@@ -161,11 +161,11 @@
 
 			let searchResultData = [];
 			// {% if not ultmarc.is_data_overflow_max_length() and  not ultmarc.is_data_empty()  %}
-				// スピナー出さない場合は以下、エスケープせず埋め込む	
+				// スピナー出さない場合は以下、エスケープせず埋め込む
 				// {% autoescape False%}
 				const searchResultString = '{{ultmarc.ultmarc_data_json_str()}}';
 				// {% endautoescape%}
-				searchResultData = JSON.parse(searchResultString);			
+				searchResultData = JSON.parse(searchResultString);
 			// {% endif %}
 
 
@@ -202,7 +202,7 @@
                 }
             })
         });
-        
+
         function pagination_content(datas) {
             const display_keys = [
 				'dcf_dsf_inst_cd',
@@ -228,7 +228,7 @@
 				return  `
 				<tr class="result_data">
 					<td><div class="checkNum">
-						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()" 
+						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()"
 						value=${data['dcf_dsf_inst_cd']}>
 					</div></td>
 					${td}

From ca26e78b595a78d5dbe80f9a0c9ab6a0d1653acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Mon, 19 Jun 2023 10:12:15 +0900
Subject: [PATCH 19/24] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py                | 2 +-
 ecs/jskult-webapp/src/model/request/ultmarc_doctor.py      | 6 +++---
 ecs/jskult-webapp/src/model/request/ultmarc_inst.py        | 6 +++---
 .../src/model/view/ultmarc_doctor_info_view_model.py       | 7 +------
 .../src/model/view/ultmarc_doctor_view_model.py            | 6 ++++--
 .../src/model/view/ultmarc_inst_view_model.py              | 6 ++++--
 ecs/jskult-webapp/src/templates/docInfo.html               | 2 +-
 ecs/jskult-webapp/src/templates/docSearch.html             | 6 +++---
 ecs/jskult-webapp/src/templates/instSearch.html            | 6 +++---
 9 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 5e9c046f..5efa8530 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -141,7 +141,7 @@ def ultmarc_inst_info_view(
     return templates_response
 
 
-@ router.post('/instInfo')
+@router.post('/instInfo')
 def ultmarc_inst_info_search(
     request: Request,
     ultmarc_inst_form: Optional[UltmarcInstInfoModel] = Depends(UltmarcInstInfoModel.as_form),
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
index e1fd6224..18ca1e37 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -19,7 +19,7 @@ class UltmarcDoctorSearchModel(BaseModel):
     trt_course_name: Optional[str]
     alma: Optional[str]
     grad_y: Optional[str]
-    pagination_pageNumber: Optional[int]
+    pagination_page_number: Optional[int]
 
     @classmethod
     def as_form(
@@ -35,7 +35,7 @@ class UltmarcDoctorSearchModel(BaseModel):
         ctrl_trt_course_name: str = Form(None),
         ctrl_alma: str = Form(None),
         ctrl_grad_y: str = Form(None),
-        pagination_pageNumber: str = Form(None)
+        pagination_page_number: str = Form(None)
     ):
 
         return cls(
@@ -50,7 +50,7 @@ class UltmarcDoctorSearchModel(BaseModel):
             trt_course_name=ctrl_trt_course_name,
             alma=ctrl_alma,
             grad_y=ctrl_grad_y,
-            pagination_pageNumber=pagination_pageNumber
+            pagination_page_number=pagination_page_number
         )
 
 
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index 8f28df30..7b60bfd9 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -17,7 +17,7 @@ class UltmarcInstSearchModel(BaseModel):
     prefc_cd: Optional[str]
     delFlg: Optional[str]
     inst_addr: Optional[str]
-    pagination_pageNumber: Optional[int]
+    pagination_page_number: Optional[int]
 
     @classmethod
     def as_form(
@@ -31,7 +31,7 @@ class UltmarcInstSearchModel(BaseModel):
         ctrl_prefc_cd: str = Form(None),
         delFlg_ctrl: str = Form(None),
         ctrl_inst_addr: str = Form(None),
-        pagination_pageNumber: str = Form(None)
+        pagination_page_number: str = Form(None)
     ):
         return cls(
             dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd,
@@ -43,7 +43,7 @@ class UltmarcInstSearchModel(BaseModel):
             prefc_cd=ctrl_prefc_cd,
             delFlg=delFlg_ctrl,
             inst_addr=ctrl_inst_addr,
-            pagination_pageNumber=pagination_pageNumber
+            pagination_page_number=pagination_page_number
         )
 
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index e84a3f3f..36b31047 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -42,14 +42,9 @@ class UltmarcDoctorInfoViewModel(BaseModel):
         return ''
 
     # 生年月日
-    def is_input_birthday_fromat(self):
+    def is_input_birthday_format(self):
         return self._format_date_string(self.doctor_info_data.birthday)
 
-    def is_input_ymd_fromat(self, ymd):
-        if ymd is None:
-            return ''
-        return ymd.strftime('%Y/%m/%d')
-
     def is_input_trt_course_data_size(self):
         return len(self.trt_coursed_data)
 
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
index 0cb0123d..b648cb2f 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
@@ -22,10 +22,12 @@ class UltmarcDoctorViewModel(BaseModel):
         return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
 
     # ページネーションのページ番号
-    def is_input_pagination_pageNumber(self):
+    # 検索時は最初のページを表示する
+    # 詳細画面からの遷移時は、元のページを表示する
+    def init_pagination_page_number(self):
         if not self.is_form_submitted():
             return 1
-        return self.form_data.pagination_pageNumber or 1
+        return self.form_data.pagination_page_number or 1
 
     # 医師コード
     def is_input_dcf_pcf_dr_cd(self):
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
index 6215f8bf..126371de 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
@@ -24,10 +24,12 @@ class UltmarcInstViewModel(BaseModel):
         return json.dumps([model.dict() for model in self.inst_data], ensure_ascii=False, default=date_handler)
 
     # ページネーションのページ番号
-    def is_input_pagination_pageNumber(self):
+    # 検索時は最初のページを表示する
+    # 詳細画面からの遷移時は、元のページを表示する
+    def init_pagination_page_number(self):
         if not self.is_form_submitted():
             return 1
-        return self.form_data.pagination_pageNumber or 1
+        return self.form_data.pagination_page_number or 1
 
     # ULT施設コード
     def is_input_dcf_dsf_inst_cd(self):
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index b0b0282a..bea95e55 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -94,7 +94,7 @@
 				<td class="docInfoTd">性別：</td>
 				<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.sex or ''}}"></td>
 				<td>生年月日:</td>
-				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_fromat()}}"></td>
+				<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_format()}}"></td>
 			</tr>
 			<tr>
 				<td colspan="6" class="docInfoTd">
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index e19c3a2a..2a594600 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -182,13 +182,13 @@
 			sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}');
 
 			// ページネーションのページ番号取得
-			let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
+			let pagination_page_number = Number('{{ultmarc.init_pagination_page_number()}}');
 
 			$(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
                 },
-                pageNumber: pagination_pageNumber, // 初期ページ番号
+                pageNumber: pagination_page_number, // 初期ページ番号
                 pageSize: 50, //表示するコンテンツ数
                 pageRange: 1, //選択されているページネーション番号の両隣に表示する個数
                 ellipsisText: '...', //省略文字
@@ -197,7 +197,7 @@
                 showNavigator: true,
                 formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
                 callback: function(data, pagination) {
-					sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
+					sessionStorage.setItem('pagination_page_number',pagination.pageNumber);
                     $('#result_data').html(pagination_content(data));
                 }
             })
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 5ac6c003..84758ddd 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -182,13 +182,13 @@
 			sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
 
 			// ページネーションのページ番号取得
-			let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
+			let pagination_page_number = Number('{{ultmarc.init_pagination_page_number()}}');
 
             $(".pagination").pagination({
                 dataSource: function(done) {
                     done(searchResultData)
                 },
-                pageNumber: pagination_pageNumber, // 初期ページ番号
+                pageNumber: pagination_page_number, // 初期ページ番号
                 pageSize: 50, //表示するコンテンツ数
                 pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
                 ellipsisText: '...', //省略文字
@@ -197,7 +197,7 @@
                 showNavigator: true,
                 formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
                 callback: function(data, pagination) {
-					sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
+					sessionStorage.setItem('pagination_page_number',pagination.pageNumber);
                     $('#result_data').html(pagination_content(data))
                 }
             })

From d56790379b5ed60c7b5920ec8e4ff42b69c1d5d4 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Mon, 19 Jun 2023 16:09:36 +0900
Subject: [PATCH 20/24] =?UTF-8?q?fix:=20DB=E6=8E=A5=E7=B6=9A=E3=82=A8?=
 =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1?=
 =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E5=87=BA=E3=81=97?=
 =?UTF-8?q?=E5=88=86=E3=81=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/router/session_router.py | 7 +++++--
 ecs/jskult-webapp/src/system_var/constants.py  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ecs/jskult-webapp/src/router/session_router.py b/ecs/jskult-webapp/src/router/session_router.py
index 8188c10f..90f3a5c9 100644
--- a/ecs/jskult-webapp/src/router/session_router.py
+++ b/ecs/jskult-webapp/src/router/session_router.py
@@ -7,7 +7,7 @@ from starlette import status
 
 from src.depends.auth import (check_session_expired, get_current_session,
                               verify_session)
-from src.error.exceptions import UnexpectedException
+from src.error.exceptions import DBException, UnexpectedException
 from src.logging.get_logger import get_logger
 from src.system_var import constants, environment
 
@@ -46,7 +46,10 @@ class MeDaCaRoute(APIRoute):
                 raise e
             except Exception as e:
                 logger.exception(e)
-                raise UnexpectedException(detail=constants.LOGOUT_REASON_UNEXPECTED)
+                if isinstance(e, DBException):
+                    raise UnexpectedException(detail=constants.LOGOUT_REASON_DB_ERROR)
+                else:
+                    raise UnexpectedException(detail=constants.LOGOUT_REASON_UNEXPECTED)
         return custom_route_handler
 
     async def pre_process_route(self, request: Request) -> Request:
diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py
index 99bdd872..899c19e5 100644
--- a/ecs/jskult-webapp/src/system_var/constants.py
+++ b/ecs/jskult-webapp/src/system_var/constants.py
@@ -114,16 +114,16 @@ LOGOUT_REASON_BATCH_PROCESSING = 'batch_processing'
 LOGOUT_REASON_BATCH_PROCESSING_FOR_MAINTE = 'batch_processing_ult'
 LOGOUT_REASON_NOT_LOGIN = 'not_login'
 LOGOUT_REASON_SESSION_EXPIRED = 'session_expired'
+LOGOUT_REASON_DB_ERROR = 'db_error'
 LOGOUT_REASON_UNEXPECTED = 'unexpected'
 
 LOGOUT_REASON_MESSAGE_MAP = {
     LOGOUT_REASON_DO_LOGOUT: 'Logoutしました。',
     LOGOUT_REASON_LOGIN_ERROR: '存在しないユーザー、<br>またはパスワードが違います。',
-    # 機能を利用できないとかでいいんじゃ
     LOGOUT_REASON_BATCH_PROCESSING: '日次バッチ処理中なので、<br>生物由来データ参照は使用出来ません。',
     LOGOUT_REASON_BATCH_PROCESSING_FOR_MAINTE: '日次バッチ処理中のため、<br>マスタ－メンテは使用出来ません。',
-    # 使ってなさそう
     LOGOUT_REASON_NOT_LOGIN: 'Loginしてからページにアクセスしてください。',
     LOGOUT_REASON_SESSION_EXPIRED: 'セッションが切れています。<br>再度Loginしてください。',
+    LOGOUT_REASON_DB_ERROR: 'DB接続に失敗しました。<br>再度Loginするか、<br>管理者にお問い合わせください。',
     LOGOUT_REASON_UNEXPECTED: '予期しないエラーが発生しました。<br>再度Loginするか、<br>管理者に問い合わせてください。'
 }

From 89f43e79df5047e09828c6669b951c105e35be6c Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Wed, 21 Jun 2023 14:44:26 +0900
Subject: [PATCH 21/24] =?UTF-8?q?fix:=20=E6=A4=9C=E7=B4=A2=E5=BE=8C?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E7=89=B9=E6=AE=8A=E8=A8=98=E5=8F=B7?=
 =?UTF-8?q?=E3=81=8C=E3=82=A8=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=97=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py         | 7 ++++---
 ecs/jskult-webapp/src/model/request/ultmarc_inst.py | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 5efa8530..8ba036e1 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -4,8 +4,8 @@ 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 (
-    UltmarcDoctorInfoModel, UltmarcDoctorSearchModel)
+from src.model.request.ultmarc_doctor import (UltmarcDoctorInfoModel,
+                                              UltmarcDoctorSearchModel)
 from src.model.request.ultmarc_inst import (UltmarcInstInfoModel,
                                             UltmarcInstSearchModel)
 from src.router.session_router import AuthenticatedRoute
@@ -77,7 +77,8 @@ def search_inst(
     ultmarc = ultmarc_service.prepare_ultmarc_inst_search_view()
     ultmarc.is_batch_processing = is_batch_processing
     ultmarc.inst_data = ultmarc_inst_data
-    ultmarc.form_data = ultmarc_inst_form
+    # 画面表示用にエスケープを解除して返す
+    ultmarc.form_data = ultmarc_inst_form.unescape()
 
     # セッション書き換え
     session.update(
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index 7b60bfd9..ba9cce90 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -1,3 +1,4 @@
+import html
 from typing import Optional
 
 from fastapi import Form
@@ -46,6 +47,12 @@ class UltmarcInstSearchModel(BaseModel):
             pagination_page_number=pagination_page_number
         )
 
+    def unescape(self):
+        for k, v in self.dict().items():
+            if v is not None and type(v) is str:
+                setattr(self, k, html.unescape(v))
+        return self
+
 
 class UltmarcInstInfoModel(BaseModel):
     inst_id: Optional[str]

From 7d74a5932008dcbe29ecc1237db58e8dc7f6ee48 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Wed, 21 Jun 2023 14:53:08 +0900
Subject: [PATCH 22/24] =?UTF-8?q?feat:=20=E3=83=AA=E3=82=AF=E3=82=A8?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AE=E5=9F=BA=E5=BA=95=E3=83=A2=E3=83=87?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E4=BD=9C=E6=88=90=E3=80=82=E3=82=B5=E3=83=8B?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=82=BA=E3=80=81=E3=82=A8=E3=82=B9=E3=82=B1?=
 =?UTF-8?q?=E3=83=BC=E3=83=97=E3=82=92=E8=A7=A3=E9=99=A4=E3=82=92=E5=85=B1?=
 =?UTF-8?q?=E9=80=9A=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/controller/ultmarc.py   |  3 ++-
 .../src/model/request/request_base_model.py   | 20 +++++++++++++++++++
 .../src/model/request/ultmarc_doctor.py       |  8 +++-----
 .../src/model/request/ultmarc_inst.py         |  9 ++++-----
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 ecs/jskult-webapp/src/model/request/request_base_model.py

diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py
index 8ba036e1..825c8b50 100644
--- a/ecs/jskult-webapp/src/controller/ultmarc.py
+++ b/ecs/jskult-webapp/src/controller/ultmarc.py
@@ -240,7 +240,8 @@ def search_doc(
     ultmarc = ultmarc_service.prepare_ultmarc_doctor_search_view()
     ultmarc.is_batch_processing = is_batch_processing
     ultmarc.doctor_data = ultmarc_doctor_data
-    ultmarc.form_data = ultmarc_doctor_form
+    # 画面表示用にエスケープを解除して返す
+    ultmarc.form_data = ultmarc_doctor_form.unescape()
 
     # セッション書き換え
     session.update(
diff --git a/ecs/jskult-webapp/src/model/request/request_base_model.py b/ecs/jskult-webapp/src/model/request/request_base_model.py
new file mode 100644
index 00000000..8194e7c0
--- /dev/null
+++ b/ecs/jskult-webapp/src/model/request/request_base_model.py
@@ -0,0 +1,20 @@
+import html
+
+from pydantic import BaseModel
+
+from src.util.sanitize import sanitize
+
+
+@sanitize
+class RequestBaseModel(BaseModel):
+    """
+    Webのリクエストを受け取る共通モデルクラス
+    保持するメンバはエスケープされる
+    エスケープを解除するには、unescapeメソッドを使用する
+    """
+
+    def unescape(self):
+        for k, v in self.dict().items():
+            if v is not None and type(v) is str:
+                setattr(self, k, html.unescape(v))
+        return self
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
index 18ca1e37..6015731e 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
@@ -1,13 +1,11 @@
 from typing import Optional
 
 from fastapi import Form
-from pydantic import BaseModel
 
-from src.util.sanitize import sanitize
+from src.model.request.request_base_model import RequestBaseModel
 
 
-@sanitize
-class UltmarcDoctorSearchModel(BaseModel):
+class UltmarcDoctorSearchModel(RequestBaseModel):
     dcf_pcf_dr_cd: Optional[str]
     dr_name: Optional[str]
     dr_name_kana: Optional[str]
@@ -54,7 +52,7 @@ class UltmarcDoctorSearchModel(BaseModel):
         )
 
 
-class UltmarcDoctorInfoModel(BaseModel):
+class UltmarcDoctorInfoModel(RequestBaseModel):
     doc_id: Optional[str]
     page_num: Optional[int]
 
diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
index ba9cce90..bddd3d9f 100644
--- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
+++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py
@@ -2,13 +2,12 @@ import html
 from typing import Optional
 
 from fastapi import Form
-from pydantic import BaseModel
 
-from src.util.sanitize import sanitize
+from src.model.request.request_base_model import RequestBaseModel
 
 
-@sanitize
-class UltmarcInstSearchModel(BaseModel):
+# @sanitize
+class UltmarcInstSearchModel(RequestBaseModel):
     dcf_dsf_inst_cd: Optional[str]
     inst_div_cd: Optional[str]
     form_inst_name_kanji: Optional[str]
@@ -54,7 +53,7 @@ class UltmarcInstSearchModel(BaseModel):
         return self
 
 
-class UltmarcInstInfoModel(BaseModel):
+class UltmarcInstInfoModel(RequestBaseModel):
     inst_id: Optional[str]
     page_num: Optional[int]
 

From 25652d7b91871d76c249cd82550bc6bba8a14227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Thu, 22 Jun 2023 09:09:06 +0900
Subject: [PATCH 23/24] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/Pipfile                     |   1 +
 ecs/jskult-webapp/Pipfile.lock                | 407 +++++++++---------
 .../src/model/db/ultmarc_doctor_wrkplace.py   |   2 -
 .../model/db/ultmarc_doctor_wrkplace_his.py   |   2 -
 .../src/model/db/ultmarc_inst_info.py         |   2 -
 .../view/ultmarc_doctor_info_view_model.py    |  25 ++
 .../repositories/ultmarc_doctor_repository.py |  15 +-
 .../repositories/ultmarc_inst_repository.py   |  17 +-
 ecs/jskult-webapp/src/templates/docInfo.html  |  16 +-
 .../src/templates/docSearch.html              |  21 +-
 ecs/jskult-webapp/src/templates/instInfo.html |   6 +-
 .../src/templates/instSearch.html             |  31 +-
 12 files changed, 303 insertions(+), 242 deletions(-)

diff --git a/ecs/jskult-webapp/Pipfile b/ecs/jskult-webapp/Pipfile
index a8087bce..436b203e 100644
--- a/ecs/jskult-webapp/Pipfile
+++ b/ecs/jskult-webapp/Pipfile
@@ -23,6 +23,7 @@ pandas = "*"
 openpyxl = "*"
 xlrd = "*"
 sqlalchemy = "*"
+mojimoji = "*"
 
 [dev-packages]
 autopep8 = "*"
diff --git a/ecs/jskult-webapp/Pipfile.lock b/ecs/jskult-webapp/Pipfile.lock
index 546ea4bd..c18f13a0 100644
--- a/ecs/jskult-webapp/Pipfile.lock
+++ b/ecs/jskult-webapp/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "3fc09dcad05f44b119f92f9955a7731128d9f9b1829240b7689102fb14f82edc"
+            "sha256": "ebbab78060c475a430a1ce8c817736651277c081230c5c0e94f0b0d02f5f46df"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -26,19 +26,19 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:30f8ab1cf89d5864a80ba2d5eb5316dbd2a63c9469877e0cffb522630438aa85",
-                "sha256:77e8fa7c257f9ed8bfe0c3ffc2ccc47b1cfa27058f99415b6003699d1202e0c0"
+                "sha256:2d4095e2029ce5ceccb25591f13e55aa5b8ba17794de09963654bd9ced45158f",
+                "sha256:dd15823e8c0554d98c18584d9a6a0342c67611c1114ef61495934c2e560f632c"
             ],
             "index": "pypi",
-            "version": "==1.26.145"
+            "version": "==1.26.155"
         },
         "botocore": {
             "hashes": [
-                "sha256:264a3f19ed280d80711b7e278be09acff7ed379a96432fdf179b4e6e3a687e6a",
-                "sha256:65e2a2b1cc70583225f87d6d63736215f93c6234721967bdab872270ba7a1f45"
+                "sha256:32d5da68212e10c060fd484f41df4f7048fc7731ccd16fd00e37b11b6e841142",
+                "sha256:7fbb7ebba5f645c9750fe557b1ea789d40017a028cdaa2c22fcbf06d4a4d3c1d"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==1.29.145"
+            "version": "==1.29.155"
         },
         "certifi": {
             "hashes": [
@@ -206,6 +206,13 @@
             "markers": "python_version >= '3.7'",
             "version": "==8.1.3"
         },
+        "colorama": {
+            "hashes": [
+                "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44",
+                "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"
+            ],
+            "version": "==0.4.6"
+        },
         "cryptography": {
             "hashes": [
                 "sha256:059e348f9a3c1950937e1b5d7ba1f8e968508ab181e75fc32b879452f08356db",
@@ -248,11 +255,11 @@
         },
         "fastapi": {
             "hashes": [
-                "sha256:4d9d3e8c71c73f11874bcf5e33626258d143252e329a01002f767306c64fb982",
-                "sha256:d374dbc4ef2ad9b803899bd3360d34c534adc574546e25314ab72c0c4411749f"
+                "sha256:95d757511c596409930bd20673358d4a4d709004edb85c5d24d6ffc48fabcbf2",
+                "sha256:b53248ee45f64f19bb7600953696e3edf94b0f7de94df1e5433fc5c6136fa986"
             ],
             "index": "pypi",
-            "version": "==0.95.2"
+            "version": "==0.97.0"
         },
         "greenlet": {
             "hashes": [
@@ -408,90 +415,113 @@
         },
         "markupsafe": {
             "hashes": [
-                "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed",
-                "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc",
-                "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2",
-                "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460",
-                "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7",
-                "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0",
-                "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1",
-                "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa",
-                "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03",
-                "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323",
-                "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65",
-                "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013",
-                "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036",
-                "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f",
-                "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4",
-                "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419",
-                "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2",
-                "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619",
-                "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a",
-                "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a",
-                "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd",
-                "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7",
-                "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666",
-                "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65",
-                "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859",
-                "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625",
-                "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff",
-                "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156",
-                "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd",
-                "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba",
-                "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f",
-                "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1",
-                "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094",
-                "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a",
-                "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513",
-                "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed",
-                "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d",
-                "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3",
-                "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147",
-                "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c",
-                "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603",
-                "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601",
-                "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a",
-                "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1",
-                "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d",
-                "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3",
-                "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54",
-                "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2",
-                "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6",
-                "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"
+                "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e",
+                "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e",
+                "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431",
+                "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686",
+                "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559",
+                "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc",
+                "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c",
+                "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0",
+                "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4",
+                "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9",
+                "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575",
+                "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba",
+                "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d",
+                "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3",
+                "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00",
+                "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155",
+                "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac",
+                "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52",
+                "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f",
+                "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8",
+                "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b",
+                "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24",
+                "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea",
+                "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198",
+                "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0",
+                "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee",
+                "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be",
+                "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2",
+                "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707",
+                "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6",
+                "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58",
+                "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779",
+                "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636",
+                "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c",
+                "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad",
+                "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee",
+                "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc",
+                "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2",
+                "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48",
+                "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7",
+                "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e",
+                "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b",
+                "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa",
+                "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5",
+                "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e",
+                "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb",
+                "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9",
+                "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57",
+                "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc",
+                "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==2.1.2"
+            "version": "==2.1.3"
+        },
+        "mojimoji": {
+            "hashes": [
+                "sha256:01a3d73e8b3c641386b1824d5106b8ea5c351a641623c910d89d8f02520c1b0e",
+                "sha256:05b589361b6f35aef96df3a7f64c2a286a7e7aed9865cd7baf1a5876bb4cd16a",
+                "sha256:515f6fa5659d77a172f1fb46950d34674f33cf487e9aa131bf9422cbe127e5f4",
+                "sha256:59cc0af7d3be3b6847c8dcf1a4e0d09cc0646ff64c101308903d14871245403c",
+                "sha256:61c03620528650603b3c92f367d6db2a645c2638408add5ba03fed982af7cd1d",
+                "sha256:7a15864d8de07a487280c528fe3d2aeaad05bb2ce6d8bf201fc1480b0b5db337",
+                "sha256:8a1285040b7ef7ca5bafe095b62b99507cf19e10c6000e3279bc44d9430da3d9",
+                "sha256:9723531661911479bbfce08ec8a62c7b5958a307f33a025fe938d19550b13f9d",
+                "sha256:98f41bf146b731ed4554c60495c53fd96339a52e02b22a869d6eaf2433047505",
+                "sha256:a98fb09bd49245f9d9cd29603b912dc2f94e619e6d2f5b722553a5dbe113ce6c",
+                "sha256:ae5e6e8d4e70849f4217fa00ca7d770354f5a13c04778b6f07f3bceb0a636abd",
+                "sha256:b110101148b920eba60fa4627b904fa18801c5ca3667880494b7f0d25dd1a5fe",
+                "sha256:b2247233f4b3bee6ab601ac7fcbd84124ad91788a7418c1430f93a4bac340218",
+                "sha256:b379781a0cb95eeb79939608b4a013ad7b79ba03b7fe9b795eadc40bd96a06c9",
+                "sha256:d974a034528cb9fb95fcade6f3ffb73dc1dc336e17413486a5094724cbe9e34f",
+                "sha256:f180e2e8ff47e54cc36b0de147bceaf76fab88ef06775835a55b38ef6b82c161",
+                "sha256:f7f4da9e809fa68588e817f1ae351c4274be2366e542c51393657cae7bcf114f"
+            ],
+            "index": "pypi",
+            "version": "==0.0.12"
         },
         "numpy": {
             "hashes": [
-                "sha256:04847257662eef90599a1beca30c757d8e562aa8c7d64e91ea465f299469075d",
-                "sha256:06bae17a3629416eb5bae3a429655dc075561206b6d3c1ddfa38b51f273bae5c",
-                "sha256:1365157813810cfda2be9518806bf32f6b5f56e5e501d8299e3b681d53e405e2",
-                "sha256:165b0fb4d5b6349eef7b909be2d61a673bc6e75e0eec43776eea3222385a9d11",
-                "sha256:1bed69508b3b97dd3fb8c439352881c1bd232a0c8dd1e11d8df4e68046d434cf",
-                "sha256:20dd2352806eb229bc79c4fa308431eaf1721c66f7928950ee0381df98a2d269",
-                "sha256:224e8862a1cd357eede831b270b9e6c51d2cbc2bb5cc2e2b8d0c76d52cbd1edc",
-                "sha256:236c8ff573c02677b873e0934419c8e9873bd2b35aaba885170b7b43cb26d5da",
-                "sha256:416da35914d2fecc3afd31127b1eb1a283df33292cfcb453e1c8fb46d52611a1",
-                "sha256:472bdc3ade289d3efa331738b1daa5a529eef0550650f5d5d2eadb936a2f83a5",
-                "sha256:48e33b46b7db13de75dd0c1c919b8b297b5d7a4dc50b181066977ee17bed7cc3",
-                "sha256:5e7ba92ad63ffded03400d5038af89f7788843794c77ad1a37522fa69762b06f",
-                "sha256:7261d100c9bf722057fd5b9cd5b48f2973b17792b41e689eeaf9b55843cd1afd",
-                "sha256:763fca81a8d8beb6bf4b9a9bbf4045b0c134c15ea66c81d26e5b8683b1861293",
-                "sha256:7cf92c2bfbaf7bd52df1a21e56e8d34cff711594498ecbd02a39df3aaada763b",
-                "sha256:8aad2f86d2036622af1e1eb9db94e26618f42a571e02583fa72d5b1983782bf8",
-                "sha256:9a18d2c173a44e48e72614748df5624875439af2d352a416b9f3840583ad9efb",
-                "sha256:a0dab69ef25ccabf6f066a4902e238767cbbe52bc5ff90aa99514f87812ba76a",
-                "sha256:a4a9f1eaa63b5e35e23e5465ed59746b0a680eb5b5da06f2d432f828d32b26c1",
-                "sha256:b1a22ae597ee1d0e2336044854b33965fd92e731efe3c2ab965826e02cca2a8c",
-                "sha256:bd1de5d7ab75cdf56f2247aace7940dfd0a8fd048e07808358d8fca604f1d102",
-                "sha256:dfe2e3845c3b630f6617f9e8a15c8a1cbaf452c9fa32c71ec0a77d09548cd662",
-                "sha256:f59080829bbfe46660a201fc17315a4e8ec6e4499ee745bab3df61866f63e771",
-                "sha256:f64b730004e500f836f6405ad5cd36d309b6ac065366a0855860155f23eb2ad5",
-                "sha256:f8cbdb428d848f03a4f6f534284cf7fb168a6ec0e742357bf65ad268316906ea"
+                "sha256:0ac6edfb35d2a99aaf102b509c8e9319c499ebd4978df4971b94419a116d0790",
+                "sha256:26815c6c8498dc49d81faa76d61078c4f9f0859ce7817919021b9eba72b425e3",
+                "sha256:4aedd08f15d3045a4e9c648f1e04daca2ab1044256959f1f95aafeeb3d794c16",
+                "sha256:4c69fe5f05eea336b7a740e114dec995e2f927003c30702d896892403df6dbf0",
+                "sha256:5177310ac2e63d6603f659fadc1e7bab33dd5a8db4e0596df34214eeab0fee3b",
+                "sha256:5aa48bebfb41f93043a796128854b84407d4df730d3fb6e5dc36402f5cd594c0",
+                "sha256:5b1b90860bf7d8a8c313b372d4f27343a54f415b20fb69dd601b7efe1029c91e",
+                "sha256:6c284907e37f5e04d2412950960894b143a648dea3f79290757eb878b91acbd1",
+                "sha256:6d183b5c58513f74225c376643234c369468e02947b47942eacbb23c1671f25d",
+                "sha256:7412125b4f18aeddca2ecd7219ea2d2708f697943e6f624be41aa5f8a9852cc4",
+                "sha256:7cd981ccc0afe49b9883f14761bb57c964df71124dcd155b0cba2b591f0d64b9",
+                "sha256:85cdae87d8c136fd4da4dad1e48064d700f63e923d5af6c8c782ac0df8044542",
+                "sha256:8aa130c3042052d656751df5e81f6d61edff3e289b5994edcf77f54118a8d9f4",
+                "sha256:95367ccd88c07af21b379be1725b5322362bb83679d36691f124a16357390153",
+                "sha256:9c7211d7920b97aeca7b3773a6783492b5b93baba39e7c36054f6e749fc7490c",
+                "sha256:9e3f2b96e3b63c978bc29daaa3700c028fe3f049ea3031b58aa33fe2a5809d24",
+                "sha256:b76aa836a952059d70a2788a2d98cb2a533ccd46222558b6970348939e55fc24",
+                "sha256:b792164e539d99d93e4e5e09ae10f8cbe5466de7d759fc155e075237e0c274e4",
+                "sha256:c0dc071017bc00abb7d7201bac06fa80333c6314477b3d10b52b58fa6a6e38f6",
+                "sha256:cc3fda2b36482891db1060f00f881c77f9423eead4c3579629940a3e12095fe8",
+                "sha256:d6b267f349a99d3908b56645eebf340cb58f01bd1e773b4eea1a905b3f0e4208",
+                "sha256:d76a84998c51b8b68b40448ddd02bd1081bb33abcdc28beee6cd284fe11036c6",
+                "sha256:e559c6afbca484072a98a51b6fa466aae785cfe89b69e8b856c3191bc8872a82",
+                "sha256:ecc68f11404930e9c7ecfc937aa423e1e50158317bf67ca91736a9864eae0232",
+                "sha256:f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19"
             ],
             "markers": "python_version < '3.10'",
-            "version": "==1.25.0rc1"
+            "version": "==1.25.0"
         },
         "openpyxl": {
             "hashes": [
@@ -541,48 +571,50 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:052d8654cb65174d6f9490cc9b9a200083a82cf5c3c5d3985db765757eb3b375",
-                "sha256:0c6fafa0965b539d7aab0a673a046466d23b86e4b0e8019d25fd53f4df62c277",
-                "sha256:1243d28e9b05003a89d72e7915fdb26ffd1d39bdd39b00b7dbe4afae4b557f9d",
-                "sha256:12f7b0bf8553e310e530e9f3a2f5734c68699f42218bf3568ef49cd9b0e44df4",
-                "sha256:1410275520dfa70effadf4c21811d755e7ef9bb1f1d077a21958153a92c8d9ca",
-                "sha256:16f8c3e33af1e9bb16c7a91fc7d5fa9fe27298e9f299cff6cb744d89d573d62c",
-                "sha256:17aef11cc1b997f9d574b91909fed40761e13fac438d72b81f902226a69dac01",
-                "sha256:191ba419b605f897ede9892f6c56fb182f40a15d309ef0142212200a10af4c18",
-                "sha256:1952526ba40b220b912cdc43c1c32bcf4a58e3f192fa313ee665916b26befb68",
-                "sha256:1ced8375969673929809d7f36ad322934c35de4af3b5e5b09ec967c21f9f7887",
-                "sha256:2e4148e635994d57d834be1182a44bdb07dd867fa3c2d1b37002000646cc5459",
-                "sha256:34d327c81e68a1ecb52fe9c8d50c8a9b3e90d3c8ad991bfc8f953fb477d42fb4",
-                "sha256:35db5301b82e8661fa9c505c800d0990bc14e9f36f98932bb1d248c0ac5cada5",
-                "sha256:3e59417ba8a17265e632af99cc5f35ec309de5980c440c255ab1ca3ae96a3e0e",
-                "sha256:42aa0c4b5c3025483240a25b09f3c09a189481ddda2ea3a831a9d25f444e03c1",
-                "sha256:666bdf6066bf6dbc107b30d034615d2627e2121506c555f73f90b54a463d1f33",
-                "sha256:66a703d1983c675a6e0fed8953b0971c44dba48a929a2000a493c3772eb61a5a",
-                "sha256:6a82d6cda82258efca32b40040228ecf43a548671cb174a1e81477195ed3ed56",
-                "sha256:6f2e754d5566f050954727c77f094e01793bcb5725b663bf628fa6743a5a9108",
-                "sha256:7456eb22ed9aaa24ff3e7b4757da20d9e5ce2a81018c1b3ebd81a0b88a18f3b2",
-                "sha256:7b1f6cb446470b7ddf86c2e57cd119a24959af2b01e552f60705910663af09a4",
-                "sha256:7d5b8641c24886d764a74ec541d2fc2c7fb19f6da2a4001e6d580ba4a38f7878",
-                "sha256:84d80219c3f8d4cad44575e18404099c76851bc924ce5ab1c4c8bb5e2a2227d0",
-                "sha256:88f195f582851e8db960b4a94c3e3ad25692c1c1539e2552f3df7a9e972ef60e",
-                "sha256:93e6bcfccbd831894a6a434b0aeb1947f9e70b7468f274154d03d71fabb1d7c6",
-                "sha256:93e766b4a8226e0708ef243e843105bf124e21331694367f95f4e3b4a92bbb3f",
-                "sha256:ab523c31e22943713d80d8d342d23b6f6ac4b792a1e54064a8d0cf78fd64e800",
-                "sha256:bb14388ec45a7a0dc429e87def6396f9e73c8c77818c927b6a60706603d5f2ea",
-                "sha256:c0ab53b609c11dfc0c060d94335993cc2b95b2150e25583bec37a49b2d6c6c3f",
-                "sha256:c33b60054b2136aef8cf190cd4c52a3daa20b2263917c49adad20eaf381e823b",
-                "sha256:ceb6a23bf1ba4b837d0cfe378329ad3f351b5897c8d4914ce95b85fba96da5a1",
-                "sha256:d532bf00f381bd6bc62cabc7d1372096b75a33bc197a312b03f5838b4fb84edd",
-                "sha256:df7800cb1984d8f6e249351139667a8c50a379009271ee6236138a22a0c0f319",
-                "sha256:e82d4566fcd527eae8b244fa952d99f2ca3172b7e97add0b43e2d97ee77f81ab",
-                "sha256:f90c1e29f447557e9e26afb1c4dbf8768a10cc676e3781b6a577841ade126b85",
-                "sha256:f9613fadad06b4f3bc5db2653ce2f22e0de84a7c6c293909b48f6ed37b83c61f"
+                "sha256:07293ab08e7b4d3c9d7de4949a0ea571f11e4557d19ea24dd3ae0c524c0c334d",
+                "sha256:0a2aabdc73c2a5960e87c3ffebca6ccde88665616d1fd6d3db3178ef427b267a",
+                "sha256:0da48717dc9495d3a8f215e0d012599db6b8092db02acac5e0d58a65248ec5bc",
+                "sha256:128d9453d92e6e81e881dd7e2484e08d8b164da5507f62d06ceecf84bf2e21d3",
+                "sha256:2196c06484da2b3fded1ab6dbe182bdabeb09f6318b7fdc412609ee2b564c49a",
+                "sha256:2e9aec8627a1a6823fc62fb96480abe3eb10168fd0d859ee3d3b395105ae19a7",
+                "sha256:3283b574b01e8dbc982080d8287c968489d25329a463b29a90d4157de4f2baaf",
+                "sha256:3c52eb595db83e189419bf337b59154bdcca642ee4b2a09e5d7797e41ace783f",
+                "sha256:4b466a23009ff5cdd7076eb56aca537c745ca491293cc38e72bf1e0e00de5b91",
+                "sha256:517a681919bf880ce1dac7e5bc0c3af1e58ba118fd774da2ffcd93c5f96eaece",
+                "sha256:5f8bbaf4013b9a50e8100333cc4e3fa2f81214033e05ac5aa44fa24a98670a29",
+                "sha256:6257bb45ad78abacda13f15bde5886efd6bf549dd71085e64b8dcf9919c38b60",
+                "sha256:67195274fd27780f15c4c372f4ba9a5c02dad6d50647b917b6a92bf00b3d301a",
+                "sha256:6cafde02f6699ce4ff643417d1a9223716ec25e228ddc3b436fe7e2d25a1f305",
+                "sha256:73ef93e5e1d3c8e83f1ff2e7fdd026d9e063c7e089394869a6e2985696693766",
+                "sha256:7845b31959468bc5b78d7b95ec52fe5be32b55d0d09983a877cca6aedc51068f",
+                "sha256:7847ca62e581e6088d9000f3c497267868ca2fa89432714e21a4fb33a04d52e8",
+                "sha256:7e1d5290044f620f80cf1c969c542a5468f3656de47b41aa78100c5baa2b8276",
+                "sha256:7ee829b86ce984261d99ff2fd6e88f2230068d96c2a582f29583ed602ef3fc2c",
+                "sha256:83fcff3c7df7adff880622a98022626f4f6dbce6639a88a15a3ce0f96466cb60",
+                "sha256:939328fd539b8d0edf244327398a667b6b140afd3bf7e347cf9813c736211896",
+                "sha256:95c70da2cd3b6ddf3b9645ecaa8d98f3d80c606624b6d245558d202cd23ea3be",
+                "sha256:963671eda0b6ba6926d8fc759e3e10335e1dc1b71ff2a43ed2efd6996634dafb",
+                "sha256:970b1bdc6243ef663ba5c7e36ac9ab1f2bfecb8ad297c9824b542d41a750b298",
+                "sha256:9863b9420d99dfa9c064042304868e8ba08e89081428a1c471858aa2af6f57c4",
+                "sha256:ad428e92ab68798d9326bb3e5515bc927444a3d71a93b4a2ca02a8a5d795c572",
+                "sha256:b48d3d634bca23b172f47f2335c617d3fcb4b3ba18481c96b7943a4c634f5c8d",
+                "sha256:b9cd67fb763248cbe38f0593cd8611bfe4b8ad82acb3bdf2b0898c23415a1f82",
+                "sha256:d111a21bbbfd85c17248130deac02bbd9b5e20b303338e0dbe0faa78330e37e0",
+                "sha256:e1aa5c2410769ca28aa9a7841b80d9d9a1c5f223928ca8bec7e7c9a34d26b1d4",
+                "sha256:e692dec4a40bfb40ca530e07805b1208c1de071a18d26af4a2a0d79015b352ca",
+                "sha256:e7c9900b43ac14110efa977be3da28931ffc74c27e96ee89fbcaaf0b0fe338e1",
+                "sha256:eec39224b2b2e861259d6f3c8b6290d4e0fbdce147adb797484a42278a1a486f",
+                "sha256:f0b7628fb8efe60fe66fd4adadd7ad2304014770cdc1f4934db41fe46cc8825f",
+                "sha256:f50e1764ce9353be67267e7fd0da08349397c7db17a562ad036aa7c8f4adfdb6",
+                "sha256:fab81a92f42d6d525dd47ced310b0c3e10c416bbfae5d59523e63ea22f82b31e"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==1.10.8"
+            "version": "==1.10.9"
         },
         "pyjwt": {
-            "extras": [],
+            "extras": [
+                "crypto"
+            ],
             "hashes": [
                 "sha256:ba2b425b15ad5ef12f200dc67dd56af4e26de2331f965c5439994dad075876e1",
                 "sha256:bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074"
@@ -592,11 +624,11 @@
         },
         "pymysql": {
             "hashes": [
-                "sha256:5072fb2637f8bfff0e7a15a9c02a0f4ba98f97800e12432e1d6d95936ec6d496",
-                "sha256:5cc02f2f60936c5d2d6122ffaff27783bd29ba7683ea45a8ab75c5083f00dc20"
+                "sha256:766b72e4370aba94e6266a4dbd62c51fbc6a894c38de25a41a8a01f0461a2387",
+                "sha256:aade29b861e81a3c68a9e90d43f3db257940c0208983a0128b82f1a4cef639aa"
             ],
             "index": "pypi",
-            "version": "==1.1.0rc1"
+            "version": "==1.1.0rc2"
         },
         "pynamodb": {
             "hashes": [
@@ -723,50 +755,50 @@
         },
         "sqlalchemy": {
             "hashes": [
-                "sha256:1a0754c2d9f0c7982bec0a31138e495ed1f6b8435d7e677c45be60ec18370acf",
-                "sha256:1d6320a1d175447dce63618ec997a53836de48ed3b44bbe952f0b4b399b19941",
-                "sha256:1e885dacb167077df15af2f9ccdacbd7f5dd0d538a6d74b94074f2cefc7bb589",
-                "sha256:201a99f922ac8c780b3929128fbd9df901418877c70e160e19adb05665e51c31",
-                "sha256:21c89044fc48a25c2184eba332edeffbbf9367913bb065cd31538235d828f06f",
-                "sha256:256b2b9660e51ad7055a9835b12717416cf7288afcf465107413917b6bb2316f",
-                "sha256:2e940a8659ef870ae10e0d9e2a6d5aaddf0ff6e91f7d0d7732afc9e8c4be9bbc",
-                "sha256:3fb5d09f1d51480f711b69fe28ad42e4f8b08600a85ab2473baee669e1257800",
-                "sha256:435f6807fa6a0597d84741470f19db204a7d34625ea121abd63e8d95f673f0c4",
-                "sha256:4670ce853cb25f72115a1bbe366ae13cf3f28fc5c87222df14f8d3d55d51816e",
-                "sha256:4a75fdb9a84072521bb2ebd31eefe1165d4dccea3039dda701a864f4b5daa17f",
-                "sha256:4d61731a35eddb0f667774fe15e5a4831e444d066081d1e809e1b8a0e3f97cae",
-                "sha256:51b19887c96d405599880da6a7cbdf8545a7e78ec5683e46a43bac8885e32d0f",
-                "sha256:536c86ec81ca89291d533ff41a3a05f9e4e88e01906dcee0751fc7082f3e8d6c",
-                "sha256:55ec62ddc0200b4fee94d11abbec7aa25948d5d21cb8df8807f4bdd3c51ba44b",
-                "sha256:5cc48a7fda2b5c5b8860494d6c575db3a101a68416492105fed6591dc8a2728a",
-                "sha256:670ecf74ee2e70b917028a06446ad26ff9b1195e84b09c3139c215123d57dc30",
-                "sha256:6a3f8020e013e9b3b7941dcf20b0fc8f7429daaf7158760846731cbd8caa5e45",
-                "sha256:6b42913a0259267e9ee335da0c36498077799e59c5e332d506e72b4f32de781d",
-                "sha256:6f5784dfb2d45c19cde03c45c04a54bf47428610106197ed6e6fa79f33bc63d3",
-                "sha256:6f80a9c9a9af0e4bd5080cc0955ce70274c28e9b931ad7e0fb07021afcd32af6",
-                "sha256:78303719c6f72af97814b0072ad18bee72e70adca8d95cf8fecd59c5e1ddb040",
-                "sha256:788d1772fb8dcd12091ca82809eef504ce0f2c423e45284bc351b872966ff554",
-                "sha256:79bfe728219239bdc493950ea4a4d15b02138ecb304771f9024d0d6f5f4e3706",
-                "sha256:810199d1c5b43603a9e815ae9487aef3ab1ade7ed9c0c485e12519358929fbfe",
-                "sha256:88ab245ed2c96265441ed2818977be28c840cfa5204ba167425d6c26eb67b7e7",
-                "sha256:933d30273861fe61f014ce2a7e3c364915f5efe9ed250ec1066ca6ea5942c0bd",
-                "sha256:994a75b197662e0608b6a76935d7c345f7fd874eac0b7093d561033db61b0e8c",
-                "sha256:9b31ebde27575b3b0708673ec14f0c305c4564d995b545148ab7ac0f4d9b847a",
-                "sha256:9d810b4aacd5ef4e293aa4ea01f19fca53999e9edcfc4a8ef1146238b30bdc28",
-                "sha256:ae1d8deb391ab39cc8f0d5844e588a115ae3717e607d91482023917f920f777f",
-                "sha256:bc5c2b0da46c26c5f73f700834f871d0723e1e882641932468d56833bab09775",
-                "sha256:cea7c4a3dfc2ca61f88a2b1ddd6b0bfbd116c9b1a361b3b66fd826034b833142",
-                "sha256:d14282bf5b4de87f922db3c70858953fd081ef4f05dba6cca3dd705daffe1cc9",
-                "sha256:d6b17cb86908e7f88be14007d6afe7d2ab11966e373044137f96a6a4d83eb21c",
-                "sha256:da7381a883aee20b7d2ffda17d909b38134b6a625920e65239a1c681881df800",
-                "sha256:db269f67ed17b07e80aaa8fba1f650c0d84aa0bdd9d5352e4ac38d5bf47ac568",
-                "sha256:df25052b92bd514357a9b370d74f240db890ea79aaa428fb893520e10ee5bc18",
-                "sha256:e17fdcb8971e77c439113642ca8861f9465e21fc693bd3916654ceef3ac26883",
-                "sha256:f6fd3c88ea4b170d13527e93be1945e69facd917661d3725a63470eb683fbffe",
-                "sha256:f7f994a53c0e6b44a2966fd6bfc53e37d34b7dca34e75b6be295de6db598255e"
+                "sha256:0db6734cb5644c55d0262a813b764c6e2cda1e66e939a488b3d6298cdc7344c2",
+                "sha256:0e4645b260cfe375a0603aa117f0a47680864cf37833129da870919e88b08d8f",
+                "sha256:131f0c894c6572cb1bdcf97c92d999d3128c4ff1ca13061296057072f61afe13",
+                "sha256:1e2caba78e7d1f5003e88817b7a1754d4e58f4a8f956dc423bf8e304c568ab09",
+                "sha256:2de1477af7f48c633b8ecb88245aedd811dca88e88aee9e9d787b388abe74c44",
+                "sha256:2f3b6c31b915159b96b68372212fa77f69230b0a32acab40cf539d2823954f5a",
+                "sha256:3ef876615ff4b53e2033022195830ec4941a6e21068611f8d77de60203b90a98",
+                "sha256:43e69c8c1cea0188b7094e22fb93ae1a1890aac748628b7e925024a206f75368",
+                "sha256:53081c6fce0d49bb36d05f12dc87e008c9b0df58a163b792c5fc4ac638925f98",
+                "sha256:5a934eff1a2882137be3384826f997db8441d43b61fda3094923e69fffe474be",
+                "sha256:5e8522b49e0e640287308b68f71cc338446bbe1c226c8f81743baa91b0246e92",
+                "sha256:61f2035dea56ff1a429077e481496f813378beb02b823d2e3e7eb05bc1a7a8ca",
+                "sha256:63ea36c08792a7a8a08958bc806ecff6b491386feeaf14607c3d9d2d9325e67f",
+                "sha256:6e85e315725807c127ad8ba3d628fdb861cf9ebfb0e10c39a97c01e257cdd71b",
+                "sha256:7641f6ed2682de84d77c4894cf2e43700f3cf7a729361d7f9cac98febf3d8614",
+                "sha256:7be04dbe3470fe8dd332fdb48c979887c381ef6c635eddf2dec43d2766111be4",
+                "sha256:81d867c1be5abd49f7e547c108391f371a9d980ba7ec34666c50d683f782b754",
+                "sha256:8544c6e62eacb77d5106e2055ef10f2407fc0dbd547e879f8745b2032eefd2bc",
+                "sha256:8d3cbdb2f07fb0e4b897dc1df39166735e194fb946f28f26f4c9f9801c8b24f7",
+                "sha256:8d6ef848e5afcd1bda3e9a843751f845c0ca888b61e669237680e913d84ec206",
+                "sha256:8e2569dac4e3cb85365b91ab569d06a221e0e17e65ce59949d00c3958946282b",
+                "sha256:90d320fde566b864adbc19abb40ecb80f4e25d6f084639969bb972d5cca16858",
+                "sha256:91eb8f89fcce8f709f8a4d65d265bc48a80264ee14c7c9e955f3222f19b4b39c",
+                "sha256:a08a791c75d6154d46914d1e23bd81d9455f2950ec1de81f2723848c593d2c8b",
+                "sha256:a2e9f50a906d0b81292576a9fb458f8cace904c81a67088f4a2ca9ff2856f55d",
+                "sha256:a5a2856e12cf5f54301ddf043bcbf0552561d61555e1bcf348b63f42b8e1eec2",
+                "sha256:b2801f85c5c0293aa710f8aa5262c707a83c1c203962ae5a22b4d9095e71aa9d",
+                "sha256:b72f4e4def50414164a1d899f2ce4e782a029fad0ed5585981d1611e8ae29a74",
+                "sha256:bdaf89dd82f4a0e1b8b5ffc9cdc0c9551be6175f7eee5af6a838e92ba2e57100",
+                "sha256:c5e333b81fe10d14efebd4e9429b7bb865ed9463ca8bef07a7136dfa1fd4a37b",
+                "sha256:ce1fc3f64fd42d5f763d6b83651471f32920338a1ba107a3186211474861af57",
+                "sha256:d0c96592f54edd571e00ba6b1ed5df8263328ca1da9e78088c0ebc93c2e6562c",
+                "sha256:dc97238fa44be86971270943a0c21c19ce18b8d1596919048e57912e8abc02cc",
+                "sha256:e19546924f0cf2ec930d1faf318b7365e5827276410a513340f31a2b423e96a4",
+                "sha256:f2938edc512dd1fa48653e14c1655ab46144d4450f0e6b33da7acd8ba77fbfd7",
+                "sha256:f387b496a4c9474d8580195bb2660264a3f295a04d3a9d00f4fa15e9e597427e",
+                "sha256:f409f35a0330ab0cb18ece736b86d8b8233c64f4461fcb10993f67afc0ac7e5a",
+                "sha256:f662cf69484c59f8a3435902c40dfc34d86050bdb15e23d437074ce9f153306b",
+                "sha256:fbcc51fdbc89fafe4f4fe66f59372a8be88ded04de34ef438ab04f980beb12d4",
+                "sha256:fc1dae11bd5167f9eb53b3ccad24a79813004612141e76de21cf4c028dc30b34",
+                "sha256:ff6496ad5e9dc8baeb93a151cc2f599d01e5f8928a2aaf0b09a06428fdbaf553"
             ],
             "index": "pypi",
-            "version": "==2.0.15"
+            "version": "==2.0.16"
         },
         "starlette": {
             "hashes": [
@@ -808,41 +840,6 @@
             "index": "pypi",
             "version": "==0.22.0"
         },
-        "uvloop": {
-            "hashes": [
-                "sha256:0949caf774b9fcefc7c5756bacbbbd3fc4c05a6b7eebc7c7ad6f825b23998d6d",
-                "sha256:0ddf6baf9cf11a1a22c71487f39f15b2cf78eb5bde7e5b45fbb99e8a9d91b9e1",
-                "sha256:1436c8673c1563422213ac6907789ecb2b070f5939b9cbff9ef7113f2b531595",
-                "sha256:23609ca361a7fc587031429fa25ad2ed7242941adec948f9d10c045bfecab06b",
-                "sha256:2a6149e1defac0faf505406259561bc14b034cdf1d4711a3ddcdfbaa8d825a05",
-                "sha256:2deae0b0fb00a6af41fe60a675cec079615b01d68beb4cc7b722424406b126a8",
-                "sha256:307958f9fc5c8bb01fad752d1345168c0abc5d62c1b72a4a8c6c06f042b45b20",
-                "sha256:30babd84706115626ea78ea5dbc7dd8d0d01a2e9f9b306d24ca4ed5796c66ded",
-                "sha256:3378eb62c63bf336ae2070599e49089005771cc651c8769aaad72d1bd9385a7c",
-                "sha256:3d97672dc709fa4447ab83276f344a165075fd9f366a97b712bdd3fee05efae8",
-                "sha256:3db8de10ed684995a7f34a001f15b374c230f7655ae840964d51496e2f8a8474",
-                "sha256:3ebeeec6a6641d0adb2ea71dcfb76017602ee2bfd8213e3fcc18d8f699c5104f",
-                "sha256:45cea33b208971e87a31c17622e4b440cac231766ec11e5d22c76fab3bf9df62",
-                "sha256:6708f30db9117f115eadc4f125c2a10c1a50d711461699a0cbfaa45b9a78e376",
-                "sha256:68532f4349fd3900b839f588972b3392ee56042e440dd5873dfbbcd2cc67617c",
-                "sha256:6aafa5a78b9e62493539456f8b646f85abc7093dd997f4976bb105537cf2635e",
-                "sha256:7d37dccc7ae63e61f7b96ee2e19c40f153ba6ce730d8ba4d3b4e9738c1dccc1b",
-                "sha256:864e1197139d651a76c81757db5eb199db8866e13acb0dfe96e6fc5d1cf45fc4",
-                "sha256:8887d675a64cfc59f4ecd34382e5b4f0ef4ae1da37ed665adba0c2badf0d6578",
-                "sha256:8efcadc5a0003d3a6e887ccc1fb44dec25594f117a94e3127954c05cf144d811",
-                "sha256:9b09e0f0ac29eee0451d71798878eae5a4e6a91aa275e114037b27f7db72702d",
-                "sha256:a4aee22ece20958888eedbad20e4dbb03c37533e010fb824161b4f05e641f738",
-                "sha256:a5abddb3558d3f0a78949c750644a67be31e47936042d4f6c888dd6f3c95f4aa",
-                "sha256:c092a2c1e736086d59ac8e41f9c98f26bbf9b9222a76f21af9dfe949b99b2eb9",
-                "sha256:c686a47d57ca910a2572fddfe9912819880b8765e2f01dc0dd12a9bf8573e539",
-                "sha256:cbbe908fda687e39afd6ea2a2f14c2c3e43f2ca88e3a11964b297822358d0e6c",
-                "sha256:ce9f61938d7155f79d3cb2ffa663147d4a76d16e08f65e2c66b77bd41b356718",
-                "sha256:dbbaf9da2ee98ee2531e0c780455f2841e4675ff580ecf93fe5c48fe733b5667",
-                "sha256:f1e507c9ee39c61bfddd79714e4f85900656db1aec4d40c6de55648e85c2799c",
-                "sha256:ff3d00b70ce95adce264462c930fbaecb29718ba6563db354608f37e49e09024"
-            ],
-            "version": "==0.17.0"
-        },
         "watchfiles": {
             "hashes": [
                 "sha256:0089c6dc24d436b373c3c57657bf4f9a453b13767150d17284fc6162b2791911",
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
index 2737644e..b0c8a5d1 100644
--- a/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_doctor_wrkplace.py
@@ -2,10 +2,8 @@ from datetime import date
 from typing import Optional
 
 from src.model.db.base_db_model import BaseDBModel
-from src.util.sanitize import sanitize
 
 
-@sanitize
 class UltmarcDoctorWrkplaceDBModel(BaseDBModel):
     dcf_dsf_inst_cd: Optional[str]
     inst_name_kanji: Optional[str]
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 b7077fd0..1609e7e3 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
@@ -2,10 +2,8 @@ from datetime import date
 from typing import Optional
 
 from src.model.db.base_db_model import BaseDBModel
-from src.util.sanitize import sanitize
 
 
-@sanitize
 class UltmarcDoctorWrkplaceHisDBModel(BaseDBModel):
     dcf_dsf_inst_cd: Optional[str]
     inst_name_kanji: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
index 5f829d97..49739dc1 100644
--- a/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
+++ b/ecs/jskult-webapp/src/model/db/ultmarc_inst_info.py
@@ -2,10 +2,8 @@ from datetime import datetime
 from typing import Optional
 
 from src.model.db.base_db_model import BaseDBModel
-from src.util.sanitize import sanitize
 
 
-@sanitize
 class UltmarcInstInfoDBModel(BaseDBModel):
     dcf_dsf_inst_cd: Optional[str]
     unconf_flg: Optional[str]
diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
index 36b31047..5de18e11 100644
--- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
@@ -45,6 +45,26 @@ class UltmarcDoctorInfoViewModel(BaseModel):
     def is_input_birthday_format(self):
         return self._format_date_string(self.doctor_info_data.birthday)
 
+    # 開始年月日
+    def is_input_aply_start_ymd_format(self, date_string):
+        if date_string:
+            return self._format_date(date_string)
+        else:
+            return ''
+
+    def is_input_his_aply_start_ymd_format(self, date_string):
+        if date_string:
+            return self._format_date(date_string)
+        else:
+            return ''
+
+    # 終了年月日
+    def is_input_his_aply_end_ymd_format(self, date_string):
+        if date_string:
+            return self._format_date(date_string)
+        else:
+            return ''
+
     def is_input_trt_course_data_size(self):
         return len(self.trt_coursed_data)
 
@@ -65,3 +85,8 @@ class UltmarcDoctorInfoViewModel(BaseModel):
             return ''
         date_str = datetime.strptime(date_string, '%Y%m%d')
         return date_str.strftime('%Y/%m/%d')
+
+    def _format_date(self, date_time):
+        if date_time is None:
+            return ''
+        return date_time.strftime('%Y/%m/%d')
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
index 7aff6444..901078ab 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
@@ -5,6 +5,7 @@ from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel
 from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
 from src.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
+import mojimoji
 
 
 class UltmarcDoctorRepository(BaseRepository):
@@ -77,7 +78,12 @@ class UltmarcDoctorRepository(BaseRepository):
         # 氏名(かな・カナ)
         if is_not_empty(parameter.dr_name_kana):
             # 必ず部分一致で検索
-            parameter.dr_name_kana = f'%{parameter.dr_name_kana}%'
+            # ひらがなを全角カタカナへ変換
+            zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
+                                        for n in [ord(c) for c in parameter.dr_name_kana]])
+            # 全角カタカナを半角カタカナへ変換
+            hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
+            parameter.dr_name_kana = f'%{hankaku_katakana}%'
             where_clauses.append(SQLCondition('dr_name_kana', condition.LIKE, 'dr_name_kana'))
         # 勤務先コード
         if is_not_empty(parameter.dcf_dsf_inst_cd):
@@ -94,7 +100,12 @@ class UltmarcDoctorRepository(BaseRepository):
         # 勤務先名(かな・カナ)
         if is_not_empty(parameter.form_inst_name_kana):
             # 必ず部分一致で検索
-            parameter.form_inst_name_kana = f'%{parameter.form_inst_name_kana}%'
+            # ひらがなを全角カタカナへ変換
+            zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
+                                        for n in [ord(c) for c in parameter.form_inst_name_kana]])
+            # 全角カタカナを半角カタカナへ変換
+            hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
+            parameter.form_inst_name_kana = f'%{hankaku_katakana}%'
             where_clauses.append(SQLCondition(
                 'form_inst_name_kana', condition.LIKE, 'form_inst_name_kana'))
 
diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
index 95e8605c..2522006f 100644
--- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
+++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
@@ -5,6 +5,7 @@ from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel
 from src.model.request.ultmarc_inst import UltmarcInstSearchModel
 from src.repositories.base_repository import BaseRepository
 from src.util.string_util import is_not_empty
+import mojimoji
 
 
 class UltmarcInstRepository(BaseRepository):
@@ -70,7 +71,12 @@ class UltmarcInstRepository(BaseRepository):
         # ULT施設名(カナ)
         if is_not_empty(parameter.form_inst_name_kana):
             # 部分一致検索
-            parameter.form_inst_name_kana = f'%{parameter.form_inst_name_kana}%'
+            # ひらがなを全角カタカナへ変換
+            zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
+                                        for n in [ord(c) for c in parameter.form_inst_name_kana]])
+            # 全角カタカナを半角カタカナへ変換
+            hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
+            parameter.form_inst_name_kana = f'%{hankaku_katakana}%'
             where_clauses.append(SQLCondition('form_inst_name_kana', condition.LIKE, 'form_inst_name_kana'))
 
         # 郵便番号
@@ -157,12 +163,15 @@ class UltmarcInstRepository(BaseRepository):
         com_spcare_med_office_dat.dcf_prnt_inst_cd
         FROM src05.com_inst
         LEFT JOIN src05.com_inst_div ON com_inst.inst_div_cd = com_inst_div.inst_div_cd
-        LEFT JOIN src05.com_inst_delete_sche_reason ON com_inst.delete_sche_reason_cd = com_inst_delete_sche_reason.delete_sche_reason_cd
+        LEFT JOIN src05.com_inst_delete_sche_reason ON
+        com_inst.delete_sche_reason_cd = com_inst_delete_sche_reason.delete_sche_reason_cd
         LEFT JOIN src05.com_manage ON com_inst.manage_cd = com_manage.manage_cd
-        LEFT JOIN src05.com_inst_addr_unknown_reason ON com_inst.addr_unknown_reason_cd = com_inst_addr_unknown_reason.addr_unknown_reason_cd
+        LEFT JOIN src05.com_inst_addr_unknown_reason ON
+        com_inst.addr_unknown_reason_cd = com_inst_addr_unknown_reason.addr_unknown_reason_cd
         LEFT JOIN src05.com_hp_assrt ON com_hp_assrt.hp_assrt_cd = com_inst.hp_assrt_cd
         LEFT JOIN src05.com_re_exam ON com_inst.re_exam_cd = com_re_exam.re_exam_cd
-        LEFT JOIN src05.com_spcare_med_office_dat ON com_inst.dcf_dsf_inst_cd = com_spcare_med_office_dat.dcf_chld_inst_cd
+        LEFT JOIN src05.com_spcare_med_office_dat ON
+        com_inst.dcf_dsf_inst_cd = com_spcare_med_office_dat.dcf_chld_inst_cd
         LEFT JOIN src05.com_inst as parent_inst ON com_inst.rltd_univ_prnt_cd = parent_inst.dcf_dsf_inst_cd
         WHERE com_inst.dcf_dsf_inst_cd = :id
     \
diff --git a/ecs/jskult-webapp/src/templates/docInfo.html b/ecs/jskult-webapp/src/templates/docInfo.html
index bea95e55..8f9beb21 100644
--- a/ecs/jskult-webapp/src/templates/docInfo.html
+++ b/ecs/jskult-webapp/src/templates/docInfo.html
@@ -115,7 +115,7 @@
 				<td colspan="6" class="docInfoTd">
 					診療科目:
 				{% for trt_coursed_data in ultmarc.trt_coursed_data %}
-					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="{{trt_coursed_data.trt_course_name}}">
+					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="{{trt_coursed_data.trt_course_name  or ''}}">
 				{% endfor %}
 				{% for i in range(5-ultmarc.is_input_trt_course_data_size())%}
 					<input class="docInfoTrtTextBox" type="text" readonly="readonly" value="">
@@ -141,8 +141,8 @@
 							<tbody>
 								{% for sosiety_data in ultmarc.sosiety_data %}
 									<tr>
-										<td>{{sosiety_data.sosiety_cd or ''}}</td>
-										<td>{{sosiety_data.sosiety_name or ''}}</td>
+										<td>{{sosiety_data.sosiety_cd or '　'}}</td>
+										<td>{{sosiety_data.sosiety_name or '　'}}</td>
 									</tr>
 								{% endfor %}
 							</tbody>
@@ -162,8 +162,8 @@
 							<tbody>
 								{% for specialist_license_data in ultmarc.specialist_license_data %}
 									<tr>
-										<td>{{specialist_license_data.specialist_cd or ''}}</td>
-										<td>{{specialist_license_data.specialist_license_name or ''}}</td>
+										<td>{{specialist_license_data.specialist_cd or '　'}}</td>
+										<td>{{specialist_license_data.specialist_license_name or '　'}}</td>
 									</tr>
 								{% endfor %}
 							</tbody>
@@ -204,7 +204,7 @@
 						<td>{{doctor_wrkplace_data.blng_sec_name or ''}}</td>
 						<td>{{doctor_wrkplace_data.univ_post_name or ''}}</td>
 						<td>{{doctor_wrkplace_data.post_name or ''}}</td>
-						<td>{{doctor_wrkplace_data.aply_start_ymd or ''}}</td>
+						<td>{{ultmarc.is_input_aply_start_ymd_format(doctor_wrkplace_data.aply_start_ymd)}}</td>
 						<td>9999/99/99</td>
 					</tr>
 				{% endif %}
@@ -218,8 +218,8 @@
 						<td>{{doctor_wrkplace_his_data.blng_sec_name or ''}}</td>
 						<td>{{doctor_wrkplace_his_data.univ_post_name or ''}}</td>
 						<td>{{doctor_wrkplace_his_data.post_name or ''}}</td>
-						<td>{{doctor_wrkplace_his_data.aply_start_ymd or ''}}</td>
-						<td>{{doctor_wrkplace_his_data.aply_end_ymd or ''}}</td>
+						<td>{{ultmarc.is_input_his_aply_start_ymd_format(doctor_wrkplace_his_data.aply_start_ymd)}}</td>
+						<td>{{ultmarc.is_input_his_aply_end_ymd_format(doctor_wrkplace_his_data.aply_end_ymd)}}</td>
 					</tr>
 				{% endif %}
 				{% endfor %}
diff --git a/ecs/jskult-webapp/src/templates/docSearch.html b/ecs/jskult-webapp/src/templates/docSearch.html
index 2a594600..365e2745 100644
--- a/ecs/jskult-webapp/src/templates/docSearch.html
+++ b/ecs/jskult-webapp/src/templates/docSearch.html
@@ -112,8 +112,8 @@
 
 	<!--検索結果-->
 	<form id="doctor_info" class="_form" name="result" action="/ultmarc/docInfo" method="POST" onsubmit="CheckBoxListProcessing()">
-		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton"  />
-		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton" />
+		<input type="button" name="allon" onclick="allOn();resultBtDisablead()" value="全選択" class="ult_bt allOnOffButton" {{ultmarc.disabled_button()}}>
+		<input type="button" name="alloff" onclick="allOff();resultBtDisablead()" value="全解除" class="ult_bt allOnOffButton" {{ultmarc.disabled_button()}}>
 		<input type="hidden" name="doc_id" id="doc_id" value="">
 		<input type="hidden" name="page_num" value="0">
 
@@ -140,19 +140,19 @@
 
 			</table>
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
-			<div class="resultAreaMsg">
+			<div class="notFind">
 				検索件数が500件を超えています 検索項目を見直してください
 			</div>
 			{% endif %}
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
-			<div class="resultAreaMsg">
+			<div class="notFind">
 				対象のデータが存在しません。
 			</div>
 			{% endif %}
 
 		</div>
 		<!--操作ボタン-->
-		<input class="ult_bt info_bt" type="submit" name="detail" value="医師情報" {{ultmarc.disabled_button()}}>
+		<input class="ult_bt info_bt" type="submit" name="detail" value="医師情報" disabled>
 	</form>
 
 	<script type="text/javascript">
@@ -241,6 +241,17 @@
 			})
 		}
 
+		// チェックボックスのチェックされている場合、施設情報ボタンを活性化させる
+		function resultBtDisablead(){
+			var checkboxes = $('input[name="data"]:checked').length;
+			if(checkboxes == 0) {
+				$(".info_bt").prop('disabled',true);
+			}
+			else {
+				$(".info_bt").prop('disabled',false);
+			}
+		}
+
 		// 検索結果のうち、チェックされている行のデータを非表示項目に詰め込む
 		function CheckBoxListProcessing()
 		{
diff --git a/ecs/jskult-webapp/src/templates/instInfo.html b/ecs/jskult-webapp/src/templates/instInfo.html
index 47951590..d93b619c 100644
--- a/ecs/jskult-webapp/src/templates/instInfo.html
+++ b/ecs/jskult-webapp/src/templates/instInfo.html
@@ -35,7 +35,7 @@
         {{ultmarc.subtitle}}
     </h1>
 	{% if ultmarc.is_batch_processing %}
-		<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
+		<div class="docButchMsg" style="text-align: center">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
 	{% endif %}
 
 	<!-- 上部のボタン -->
@@ -192,7 +192,7 @@
 				<td class="instData border_bottom_none" colspan="4">
 					{% if ultmarc.inst_trt_coursed_data != None %}
 						{% for inst_trt_course_data in ultmarc.inst_trt_coursed_data %}
-							<input class="trtCourseTextbox" type="text" readonly="readonly" value="{{inst_trt_course_data.trt_course_name_abb}}">
+							<input class="trtCourseTextbox" type="text" readonly="readonly" value="{{inst_trt_course_data.trt_course_name_abb or ''}}">
 						{% endfor %}
 					{% endif %}
 					{% for i in range(60-ultmarc.is_input_inst_trt_course_data_size()) %}
@@ -258,7 +258,7 @@
 				<td class="hpInfoColumn">病床数(定員)</td>
 				<td class="instData"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.bed_num or ''}}" class="xSmallTextbox numberBox"></td>
 				<td class="hpInfoColumn">メンテ年月日</td>
-				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_maint_ymd or ''}}" class="xSmallTextbox"></td>
+				<td class="instData xSmallTd"><input type="text" readonly="readonly" value="{{ultmarc.inst_info_data.prmit_bed_maint_ymd or ''}}" class="repreTextbox"></td>
 			</tr>
 		</tbody>
 	</table>
diff --git a/ecs/jskult-webapp/src/templates/instSearch.html b/ecs/jskult-webapp/src/templates/instSearch.html
index 84758ddd..361977ae 100644
--- a/ecs/jskult-webapp/src/templates/instSearch.html
+++ b/ecs/jskult-webapp/src/templates/instSearch.html
@@ -38,7 +38,7 @@
 					<td>ULT施設コード：</td>
 					<td class="search_tb leftSearch_tb">
 						<input class="text search_textbox" style="ime-mode:disabled;" type="text" name="ctrl_dcf_dsf_inst_cd"
-                        value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" oninput="formBtDisabled()">
+                        value="{{ultmarc.is_input_dcf_dsf_inst_cd()}}" maxlength='11' oninput="formBtDisabled()">
 					</td>
 					<td>施設区分：</td>
 					<td class="search_tb">
@@ -69,10 +69,10 @@
 				<tr>
 					<td>郵便番号：</td>
 					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_postal_number"
-                        value="{{ultmarc.is_input_postal_number()}}" oninput="formBtDisabled()">
+                        value="{{ultmarc.is_input_postal_number()}}" maxlength='8' oninput="formBtDisabled()">
 					<td>電話番号：</td>
 					<td class="search_tb"><input class="text search_textbox"  style="ime-mode:disabled;" type="text" name="ctrl_inst_phone_number"
-                        value="{{ultmarc.is_input_inst_phone_number()}}" oninput="formBtDisabled()">
+                        value="{{ultmarc.is_input_inst_phone_number()}}" maxlength='15' oninput="formBtDisabled()">
                     </td>
 				</tr>
 				<tr>
@@ -112,8 +112,8 @@
 
 	<!--検索結果-->
 	<form class="_form" name="result" action="/ultmarc/instInfo" method="POST"  onsubmit="CheckBoxListProcessing()">
-		<input type="button" name="allon" onclick="allOn()" value="全選択" class="ult_bt allOnOffButton">
-		<input type="button" name="alloff" onclick="allOff()" value="全解除" class="ult_bt allOnOffButton">
+		<input type="button" name="allon" onclick="allOn(); resultBtDisablead()" value="全選択" class="ult_bt allOnOffButton" {{ultmarc.disabled_button()}}>
+		<input type="button" name="alloff" onclick="allOff(); resultBtDisablead()" value="全解除" class="ult_bt allOnOffButton" {{ultmarc.disabled_button()}}>
 		<input type="hidden" name="inst_id" id="inst_id" value="">
 		<input type="hidden" name="page_num" value="0">
 
@@ -140,19 +140,19 @@
 				<tbody id="result_data" class="result_data"></tbody>
 			</table>
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_overflow_max_length() %}
-			<div class="resultAreaMsg">
+			<div class="notFind">
 				検索件数が500件を超えています 検索項目を見直してください
 			</div>
 			{% endif %}
 			{% if ultmarc.is_form_submitted() and ultmarc.is_data_empty() %}
-			<div class="resultAreaMsg">
+			<div class="notFind">
 				対象のデータが存在しません
 			</div>
 			{% endif %}
 			</div>
 
 		<!--操作ボタン-->
-		<input class="ult_bt info_bt" type="submit" name="detail" value="施設情報" {{ultmarc.disabled_button()}}>
+		<input class="ult_bt info_bt" type="submit" name="detail" value="施設情報" disabled>
 	</form>
 
 	<script type="text/javascript">
@@ -228,7 +228,7 @@
 				return  `
 				<tr class="result_data">
 					<td><div class="checkNum">
-						<input type="checkbox" class="checkbox selected" name="data"  onclick="resultBtDisablead()"
+						<input type="checkbox" class="checkbox selected" name="data" onclick="resultBtDisablead()"
 						value=${data['dcf_dsf_inst_cd']}>
 					</div></td>
 					${td}
@@ -237,6 +237,17 @@
 			})
 		}
 
+		// チェックボックスのチェックされている場合、施設情報ボタンを活性化させる
+		function resultBtDisablead(){
+			var checkboxes = $('input[name="data"]:checked').length;
+			if(checkboxes == 0) {
+				$(".info_bt").prop('disabled',true);
+			}
+			else {
+				$(".info_bt").prop('disabled',false);
+			}
+		}
+
 		// // 検索結果のうち、チェックされている行のデータを非表示項目に詰め込む
 		function CheckBoxListProcessing()
 		{
@@ -246,6 +257,8 @@
 			});
 			$("#inst_id").val(vals.join(','));
 		}
+
+
 	</script>
 </body>
 </html>
\ No newline at end of file

From 3d54ec82599378e1f26793a90aea29237ae7a45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Tue, 27 Jun 2023 16:21:13 +0900
Subject: [PATCH 24/24] =?UTF-8?q?allon=E3=81=A8alloff=E3=81=AE=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/function/businessLogicScript.js    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index ee4beb0c..36171aad 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -135,26 +135,6 @@ $(function(){
     $(".send").prop('disabled',true);
 });
 
-// チェックボックス全選択関数
-// 条件：チェックボックスのクラス名に"selectedページ数"というのがついていること
-// 条件：ボタンにクラス名 send がついていること
-function allOn(){
-    var selected = ".selected" + tableCurrentPage + " input.checkbox";
-    $(selected).prop("checked", true);
-    $(".send").prop('disabled',false);
-}
-
-// チェックボックス全解除関数
-// 条件：チェックボックスのクラス名に"selectedページ数"というのがついていること
-// 条件：ボタンにクラス名 send がついていること
-function allOff(pageCount){
-    for (var i = 1; i <= pageCount; i++) {
-        var selected = ".selected" + i + " input.checkbox";
-        $(selected).prop("checked", false);
-    }
-    $(".send").prop('disabled',true);
-}
-
 // 検索結果のところのボタンをチェックが1個でも付いたら押せるようにして、チェックがなければ押せないようにする関数
 // 条件：チェックボックスのクラス名に"selectedページ数"というのがついていること
 // 条件：ボタンにクラス名 send がついていること