1. 환자용 앱 생치 리스트 소팅 (가나다순)

2. 환자관리, 진료관리 환자정보 테이블 공통으로 변경

src/main/resources/mybatis/mapper/staff/staff.xml

@@ -224,6 +224,7 @@
                    CENTER_NAME AS centerName
               FROM CENTER_INFO
              WHERE 1 = 1
+             ORDER BY CENTER_NAME
         ]]>
     </select>
     

src/main/webapp/WEB-INF/jsp/clinic/info.jsp

@@ -995,201 +995,7 @@ $(document).ready(function() {
 									<a href="#" class="toggleBtn">메뉴</a>
 								</div>
 								<div class="card-body">
-									<table class="table mobile-table user-info">
-										<colgroup>
-											<col style="width: 15%">
-											<col style="width: 35%">
-											<col style="width: 15%">
-											<col style="width: 35%">
-										</colgroup>
-										<tr>
-												<th>치료센터</th>
-												<td><c:out value="${info.centerName}" /></td>
-												<th>입소일시</th>
-												<td colspan="2">
-														<c:out value="${info.hospitalizationDate}" />
-												</td>
-										</tr>
-										<tr>
-												<th>병동 번호</th>
-												<td>
-														<c:out value="${info.wardNumber}동 ${info.roomNumber}호" />
-												</td>
-												<th>이름</th>
-												<td>
-														<c:out value="${info.patientName}" />
-												</td>
-										</tr>
-										<tr>
-												<th>성별</th>
-												<td>
-														<c:if test="${info.gender eq 'M'}">
-																남
-														</c:if>
-														<c:if test="${info.gender ne 'M'}">
-																여
-														</c:if>
-												</td>
-												<th>생년월일</th>
-												<td>
-														<c:out value="${info.jumin}" />
-												</td>
-										</tr>
-										<tr>
-												<th>연락처</th>
-												<td>
-														<c:out value="${info.patientPhone}" />
-												</td>
-												<th>보호자 연락처</th>
-												<td>
-														<c:out value="${info.guardianPhone}" />
-												</td>
-										</tr>
-										<tr>
-												<th>증상시작일</th>
-												<td>
-														<c:out value="${info.symptomStartDate}" />
-												</td>
-												<th>확진일</th>
-												<td>
-														<c:out value="${info.confirmationDate}" />
-												</td>
-										</tr>
-										<tr>
-												<th>격리해제 예정일</th>
-												<td>
-														<c:out value="${info.disisolationDate}" />
-												</td>
-												<th>상태</th>
-												<td>
-														<c:if test="${info.state eq 'H'}">
-																입소
-														</c:if>
-														<c:if test="${info.state eq 'D'}">
-																퇴소
-														</c:if>
-														<c:if test="${info.state eq 'T'}">
-																지정병원 이송
-														</c:if>
-														<c:if test="${info.state eq 'E'}">
-																기타
-														</c:if>
-												</td>
-										</tr>
-										<tr>
-												<th>최근 약복용<br />(최근 24시간 이내)</th>
-												<td>
-														<c:choose>
-																<c:when test="${info.drugYn eq 'Y'}">
-																		복용 (<c:out value="${info.drugContent}" />)
-																</c:when>
-																<c:otherwise>
-																		미복용
-																</c:otherwise>
-														</c:choose>
-												</td>
-												<th>임신</th>
-												<td>
-														<c:choose>
-																<c:when test="${info.pregnancyStatus eq 'N'}">
-																		무
-																</c:when>
-																<c:otherwise>
-																		유 (<c:out value="${info.pregnancyWeek}주차" />)
-																</c:otherwise>
-														</c:choose>
-												</td>
-										</tr>
-										<tr>
-												<th rowspan="2">기저질환 여부</th>
-												<td colspan="3">
-														<c:choose>
-																<c:when test="${info.basalDiseaseYn eq 'Y'}">
-																		유
-																</c:when>
-																<c:otherwise>
-																		무
-																</c:otherwise>
-														</c:choose>
-												</td>
-										</tr>
-										<tr>
-												<td colspan="3">
-<%--                                                 <c:if test="${info.highBloodPressureCheck eq 'Y'}">, 고혈압</c:if> --%>
-<%--                                                 <c:if test="${info.lowBloodPressureCheck eq 'Y'}">, 저혈압</c:if> --%>
-<%--                                                 <c:if test="${info.organTransplantCheck eq 'Y'}">, 장기이식(신장, 간 등)</c:if> --%>
-<%--                                                 <c:if test="${info.diabetesCheck eq 'Y'}">, 당뇨</c:if> --%>
-<%--                                                 <c:if test="${info.respiratoryDiseaseCheck eq 'Y'}">, 호흡기질환</c:if> --%>
-<%--                                                 <c:if test="${info.immunologicalDiseaseCheck eq 'Y'}">, 면역질환(류마티스 등)</c:if> --%>
-<%--                                                 <c:if test="${info.heartDisease eq 'Y'}">, 심장질환</c:if> --%>
-<%--                                                 <c:if test="${info.liverDisease eq 'Y'}">, 간질환</c:if> --%>
-<%--                                                 <c:if test="${info.operation eq 'Y'}">, 수술(<c:out value="${info.operationContent}" />)</c:if> --%>
-<%--                                                 <c:if test="${info.allergyCheck eq 'Y'}">, 알레르기</c:if> --%>
-<%--                                                 <c:if test="${info.kidneyDisease eq 'Y'}">, 신장질환</c:if> --%>
-<%--                                                 <c:if test="${info.cancerCheck eq 'Y'}">, 암(<c:out value="${info.cancerName}" />)</c:if> --%>
-<%--                                                 <c:if test="${info.ectCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if> --%>
-														<c:out value="${disease}" />
-												</td>
-										</tr>
-										<tr>
-												<th>현재 증상<br />(입소 당시)</th>
-												<td colspan="3">
-<%--                                                 <c:if test="${info.feverCheck eq 'Y'}">, 열감(열나는느낌)</c:if> --%>
-<%--                                                 <c:if test="${info.coughCheck eq 'Y'}">, 기침</c:if> --%>
-<%--                                                 <c:if test="${info.colic eq 'Y'}">, 복통(배아픔)</c:if> --%>
-<%--                                                 <c:if test="${info.coldFitCheck eq 'Y'}">, 오한(추운 느낌)</c:if> --%>
-<%--                                                 <c:if test="${info.sputumCheck eq 'Y'}">, 가래</c:if> --%>
-<%--                                                 <c:if test="${info.ocinCheck eq 'Y'}">, 오심(구역질)</c:if> --%>
-<%--                                                 <c:if test="${info.chestPain eq 'Y'}">, 흉통</c:if> --%>
-<%--                                                 <c:if test="${info.noseCheck eq 'Y'}">, 콧물 또는 코 막힘</c:if> --%>
-<%--                                                 <c:if test="${info.vomitingCheck eq 'Y'}">, 구토</c:if> --%>
-<%--                                                 <c:if test="${info.musclePainCheck eq 'Y'}">, 근육통(몸살)</c:if> --%>
-<%--                                                 <c:if test="${info.soreThroatCheck eq 'Y'}">, 인후통(목 아픔)</c:if> --%>
-<%--                                                 <c:if test="${info.diarrheaCheck eq 'Y'}">, 설사</c:if> --%>
-<%--                                                 <c:if test="${info.headacheCheck eq 'Y'}">, 두통(머리아픔)</c:if> --%>
-<%--                                                 <c:if test="${info.dyspneaCheck eq 'Y'}">, 호흡곤란(숨가쁨)</c:if> --%>
-<%--                                                 <c:if test="${info.fatigueCheck eq 'Y'}">, 권태감(피곤함)</c:if> --%>
-<%--                                                 <c:if test="${info.ectCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if> --%>
-														<c:out value="${symptom}" />
-												</td>
-										</tr>
-										<tr>
-												<th>
-														체온
-												</th>
-												<td>
-														<c:out value="우측 ${info.feverRight}℃ /  좌측  ${info.feverRight}℃" />
-												</td>
-												<th>
-														맥박수
-												</th>
-												<td>
-														<c:out value="${info.pulseRate} 회/분" />
-												</td>
-										</tr>
-										<tr>
-												<th>
-														호흡수
-												</th>
-												<td>
-														<c:out value="${info.respirationRate} 회/분" />
-												</td>
-												<th>
-														혈압
-												</th>
-												<td>
-												<c:out value="수축기 ${info.bloodPressureLevelCon} mmHg  /  이완기 ${info.bloodPressureLevelRel} mmHg" />
-												</td>
-										</tr>
-										<tr>
-												<th>
-														산소포화도
-												</th>
-												<td colspan="3">
-														<c:out value="${info.oxygenSaturation} %" />
-												</td>
-										</tr>
-									</table>
+                                    <jsp:include page="${data._INCLUDE}/patientInfo.jsp"></jsp:include>
 									<div class="row mt-3">
 										<div class="col-12">
 											<div class="text-right">

src/main/webapp/WEB-INF/jsp/include/patientInfo.jsp

@@ -0,0 +1,184 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<input type="hidden" name="enIdx" value="<c:out value="${enIdx}" />">
+<table class="table mobile-table user-info">
+    <colgroup>
+        <col style="width:15%">
+        <col style="width:35%">
+        <col style="width:15%">
+        <col style="width:35%">
+    </colgroup>
+    <tr>
+        <th>치료센터</th>
+        <td><c:out value="${info.centerName}" /></td>
+        <th>입소일시</th>
+        <td colspan="2">
+            <fmt:parseDate var="hDate" value="${info.hospitalizationDate}" pattern="yyyy-MM-dd" />
+            <c:set var="hospitalizationDate"><fmt:formatDate value="${hDate}" pattern="yyyy년 MM월 dd일" /></c:set>
+            <c:out value="${hospitalizationDate}" />
+        </td>
+    </tr>
+    <tr>
+        <th class="roomNumber">병동 번호</th>
+        <td>
+            <c:if test="${info.wardNumber ne null and info.wardNumber ne ''}">
+                <c:out value="${info.wardNumber}"/>동 
+            </c:if>
+            <c:out value="${info.roomNumber}" />호 
+        </td>
+        <th>이름</th>
+        <td class="patientName">
+            <c:out value="${info.patientName}" />
+        </td>
+    </tr>
+    <tr>
+        <th>성별</th>
+        <td class="patientGender">
+            <c:if test="${info.gender eq 'M'}">
+                남
+            </c:if>
+            <c:if test="${info.gender ne 'M'}">
+                여
+            </c:if>
+        </td>
+        <th>생년월일</th>
+        <td class="patientBirthday">
+            <c:out value="${info.jumin}" />
+        </td>
+    </tr>
+    <tr>
+        <th>연락처</th>
+        <td>
+            <c:out value="${info.patientPhone}" /> <c:if test="${info.foreignerYn eq 'Y'}"><span class="text-danger">(외국인)</span></c:if>
+        </td>
+        <th>보호자 연락처</th>
+        <td>
+            <c:out value="${info.guardianPhone}" />
+        </td>
+    </tr>
+    <tr>
+        <th>증상시작일</th>
+        <td>
+            <fmt:parseDate var="symptomStartDateTime" value="${info.symptomStartDate}" pattern="yyyy-MM-dd" />
+            <c:set var="symptomStartDate"><fmt:formatDate value="${symptomStartDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
+            <c:out value="${symptomStartDate}" />
+        </td>
+        <th>확진일</th>
+        <td>
+            <fmt:parseDate var="confirmationDateTime" value="${info.confirmationDate}" pattern="yyyy-MM-dd" />
+            <c:set var="confirmationDate"><fmt:formatDate value="${confirmationDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
+            <c:out value="${confirmationDate}" />
+        </td>
+    </tr>
+    <tr>
+        <th>상태 변경일</br>(퇴소, 지정병원이송, 기타)</th>
+        <td>
+            <fmt:parseDate var="disisolationDateTime" value="${info.disisolationDate}" pattern="yyyy-MM-dd" />
+            <c:set var="disisolationDate"><fmt:formatDate value="${disisolationDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
+            <c:out value="${disisolationDate}" />
+            <c:if test="${info.state eq 'D'}">(퇴소)</c:if>
+            <c:if test="${info.state eq 'T'}">(지정병원 이송)</c:if>
+            <c:if test="${info.state eq 'E'}">(기타)</c:if>
+        </td>
+        <th>상태</th>
+        <td>
+            <c:if test="${info.state eq 'H'}">입소</c:if>
+            <c:if test="${info.state eq 'D'}">퇴소</c:if>
+            <c:if test="${info.state eq 'T'}">지정병원 이송</c:if>
+            <c:if test="${info.state eq 'E'}">기타</c:if>
+        </td>
+    </tr>
+    <tr>
+        <th>담당 의료진</th>
+        <td>
+            <c:forEach var="sl" items="${staffList}">
+                <c:if test="${info.managerId eq sl.id}"><c:out value="${sl.name} (${sl.id})"/></c:if>
+            </c:forEach>
+        </td>
+    </tr>
+    <tr>
+        <th>문진작성(환자용 앱)</th>
+        <td colspan="3">
+            <c:if test="${info.serveyYn eq 'Y'}">가능</c:if>
+            <c:if test="${info.serveyYn eq 'N'}">불가능</c:if>
+        </td>
+    </tr>
+    <tr>
+        <th>최근 약복용<br />(최근 24시간 이내)</th>
+        <td>
+            <c:choose>
+                <c:when test="${info.drugYn eq 'Y'}">복용 (<c:out value="${info.drugContent}" />)</c:when>
+                <c:when test="${info.drugYn eq 'N'}">미복용</c:when>
+                <c:otherwise></c:otherwise>
+            </c:choose>
+        </td>
+        <th>임신</th>
+        <td>
+            <c:choose>
+                <c:when test="${info.pregnancyStatus eq 'N'}">무</c:when>
+                <c:when test="${info.pregnancyStatus eq 'Y'}">유 (<c:out value="${info.pregnancyWeek}주차" />)</c:when>
+                <c:otherwise></c:otherwise>
+            </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <th rowspan="2">기저질환 여부</th>
+        <td colspan="3">
+            <c:choose>
+                <c:when test="${info.basalDiseaseYn eq 'Y'}">유</c:when>
+                <c:when test="${info.basalDiseaseYn eq 'N'}">무</c:when>
+                <c:otherwise></c:otherwise>
+            </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="3">
+            <c:out value="${disease}" />
+        </td>
+    </tr>
+    <tr>
+        <th>현재 증상<br />(입소 당시)</th>
+        <td colspan="3">
+            <c:out value="${symptom}" />
+        </td>
+    </tr>
+    <tr>
+        <th>
+            체온
+        </th>
+        <td>
+            <c:out value="우측 ${info.feverRight}℃ /  좌측  ${info.feverRight}℃" />
+        </td>
+        <th>
+            맥박수
+        </th>
+        <td>
+            <c:out value="${info.pulseRate} 회/분" />
+        </td>
+    </tr>
+    <tr>
+        <th>
+            호흡수
+        </th>
+        <td>
+            <c:out value="${info.respirationRate} 회/분" />
+        </td>
+        <th>
+            혈압
+        </th>
+        <td>
+        <c:out value="수축기 ${info.bloodPressureLevelCon} mmHg  /  이완기 ${info.bloodPressureLevelRel} mmHg" />
+        </td>
+    </tr>
+    <tr>
+        <th>
+            산소포화도
+        </th>
+        <td colspan="3">
+            <c:out value="${info.oxygenSaturation} %" />
+        </td>
+    </tr>
+</table>

src/main/webapp/WEB-INF/jsp/patient/info.jsp

@@ -51,218 +51,7 @@ function deleteConfirm(){
                             <div class="card">
                                 <div class="card-body">
                                     <form method="post" id="pForm">
-                                        <input type="hidden" name="enIdx" value="<c:out value="${enIdx}" />">
-                                        
-                                        <table class="table mobile-table">
-                                            <colgroup>
-                                                <col style="width:15%">
-                                                <col style="width:35%">
-                                                <col style="width:15%">
-                                                <col style="width:35%">
-                                            </colgroup>
-                                            <tr>
-                                                <th>치료센터</th>
-                                                <td><c:out value="${info.centerName}" /></td>
-                                                <th>입소일시</th>
-                                                <td colspan="2">
-                                                    <fmt:parseDate var="hDate" value="${info.hospitalizationDate}" pattern="yyyy-MM-dd" />
-                                                    <c:set var="hospitalizationDate"><fmt:formatDate value="${hDate}" pattern="yyyy년 MM월 dd일" /></c:set>
-                                                    <c:out value="${hospitalizationDate}" />
-    <%--                                                 <c:out value="${info.hospitalizationDate}" /> --%>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>병동 번호</th>
-                                                <td>
-                                                    <c:if test="${info.wardNumber ne null and info.wardNumber ne ''}">
-                                                        <c:out value="${info.wardNumber}"/>동 
-                                                    </c:if>
-                                                    <c:out value="${info.roomNumber}" />호 
-                                                </td>
-                                                <th>이름</th>
-                                                <td>
-                                                    <c:out value="${info.patientName}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>성별</th>
-                                                <td>
-                                                    <c:if test="${info.gender eq 'M'}">
-                                                        남
-                                                    </c:if>
-                                                    <c:if test="${info.gender ne 'M'}">
-                                                        여
-                                                    </c:if>
-                                                </td>
-                                                <th>생년월일</th>
-                                                <td>
-                                                    <c:out value="${info.jumin}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>연락처</th>
-                                                <td>
-                                                    <c:out value="${info.patientPhone}" /> <c:if test="${info.foreignerYn eq 'Y'}"><span class="text-danger">(외국인)</span></c:if>
-                                                </td>
-                                                <th>보호자 연락처</th>
-                                                <td>
-                                                    <c:out value="${info.guardianPhone}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>증상시작일</th>
-                                                <td>
-                                                    <fmt:parseDate var="symptomStartDateTime" value="${info.symptomStartDate}" pattern="yyyy-MM-dd" />
-                                                    <c:set var="symptomStartDate"><fmt:formatDate value="${symptomStartDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
-                                                    <c:out value="${symptomStartDate}" />
-                                                </td>
-                                                <th>확진일</th>
-                                                <td>
-                                                    <fmt:parseDate var="confirmationDateTime" value="${info.confirmationDate}" pattern="yyyy-MM-dd" />
-                                                    <c:set var="confirmationDate"><fmt:formatDate value="${confirmationDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
-                                                    <c:out value="${confirmationDate}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-    <!--                                             <th>격리해제 예정일</th> -->
-                                                <th>상태 변경일</br>(퇴소, 지정병원이송, 기타)</th>
-                                                <td>
-                                                    <fmt:parseDate var="disisolationDateTime" value="${info.disisolationDate}" pattern="yyyy-MM-dd" />
-                                                    <c:set var="disisolationDate"><fmt:formatDate value="${disisolationDateTime}" pattern="yyyy년 MM월 dd일" /></c:set>
-                                                    <c:out value="${disisolationDate}" />
-                                                    <c:if test="${info.state eq 'D'}">(퇴소)</c:if>
-                                                    <c:if test="${info.state eq 'T'}">(지정병원 이송)</c:if>
-                                                    <c:if test="${info.state eq 'E'}">(기타)</c:if>
-                                                </td>
-                                                <th>상태</th>
-                                                <td>
-                                                    <c:if test="${info.state eq 'H'}">입소</c:if>
-                                                    <c:if test="${info.state eq 'D'}">퇴소</c:if>
-                                                    <c:if test="${info.state eq 'T'}">지정병원 이송</c:if>
-                                                    <c:if test="${info.state eq 'E'}">기타</c:if>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>담당 의료진</th>
-                                                <td>
-                                                    <c:forEach var="sl" items="${staffList}">
-                                                        <c:if test="${info.managerId eq sl.id}"><c:out value="${sl.name} (${sl.id})"/></c:if>
-                                                    </c:forEach>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>문진작성(환자용 앱)</th>
-                                                <td colspan="3">
-                                                    <c:if test="${info.serveyYn eq 'Y'}">가능</c:if>
-                                                    <c:if test="${info.serveyYn eq 'N'}">불가능</c:if>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>최근 약복용<br />(최근 24시간 이내)</th>
-                                                <td>
-                                                    <c:choose>
-                                                        <c:when test="${info.drugYn eq 'Y'}">복용 (<c:out value="${info.drugContent}" />)</c:when>
-                                                        <c:when test="${info.drugYn eq 'N'}">미복용</c:when>
-                                                        <c:otherwise></c:otherwise>
-                                                    </c:choose>
-                                                </td>
-                                                <th>임신</th>
-                                                <td>
-                                                    <c:choose>
-                                                        <c:when test="${info.pregnancyStatus eq 'N'}">무</c:when>
-                                                        <c:when test="${info.pregnancyStatus eq 'Y'}">유 (<c:out value="${info.pregnancyWeek}주차" />)</c:when>
-                                                        <c:otherwise></c:otherwise>
-                                                    </c:choose>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th rowspan="2">기저질환 여부</th>
-                                                <td colspan="3">
-                                                    <c:choose>
-                                                        <c:when test="${info.basalDiseaseYn eq 'Y'}">유</c:when>
-                                                        <c:when test="${info.basalDiseaseYn eq 'N'}">무</c:when>
-                                                        <c:otherwise></c:otherwise>
-                                                    </c:choose>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="3">
-    <%--                                                 <c:if test="${info.highBloodPressureCheck eq 'Y'}">, 고혈압</c:if> --%>
-    <%--                                                 <c:if test="${info.lowBloodPressureCheck eq 'Y'}">, 저혈압</c:if> --%>
-    <%--                                                 <c:if test="${info.organTransplantCheck eq 'Y'}">, 장기이식(신장, 간 등)</c:if> --%>
-    <%--                                                 <c:if test="${info.diabetesCheck eq 'Y'}">, 당뇨</c:if> --%>
-    <%--                                                 <c:if test="${info.respiratoryDiseaseCheck eq 'Y'}">, 호흡기질환</c:if> --%>
-    <%--                                                 <c:if test="${info.immunologicalDiseaseCheck eq 'Y'}">, 면역질환(류마티스 등)</c:if> --%>
-    <%--                                                 <c:if test="${info.heartDisease eq 'Y'}">, 심장질환</c:if> --%>
-    <%--                                                 <c:if test="${info.liverDisease eq 'Y'}">, 간질환</c:if> --%>
-    <%--                                                 <c:if test="${info.operation eq 'Y'}">, 수술(<c:out value="${info.operationContent}" />)</c:if> --%>
-    <%--                                                 <c:if test="${info.allergyCheck eq 'Y'}">, 알레르기</c:if> --%>
-    <%--                                                 <c:if test="${info.kidneyDisease eq 'Y'}">, 신장질환</c:if> --%>
-    <%--                                                 <c:if test="${info.cancerCheck eq 'Y'}">, 암(<c:out value="${info.cancerName}" />)</c:if> --%>
-    <%--                                                 <c:if test="${info.ectCheckDisease eq 'Y'}">, 기타(<c:out value="${info.etcContentDisease}" />)</c:if> --%>
-                                                    <c:out value="${disease}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>현재 증상<br />(입소 당시)</th>
-                                                <td colspan="3">
-    <%--                                                 <c:if test="${info.feverCheck eq 'Y'}">, 열감(열나는느낌)</c:if> --%>
-    <%--                                                 <c:if test="${info.coughCheck eq 'Y'}">, 기침</c:if> --%>
-    <%--                                                 <c:if test="${info.colic eq 'Y'}">, 복통(배아픔)</c:if> --%>
-    <%--                                                 <c:if test="${info.coldFitCheck eq 'Y'}">, 오한(추운 느낌)</c:if> --%>
-    <%--                                                 <c:if test="${info.sputumCheck eq 'Y'}">, 가래</c:if> --%>
-    <%--                                                 <c:if test="${info.ocinCheck eq 'Y'}">, 오심(구역질)</c:if> --%>
-    <%--                                                 <c:if test="${info.chestPain eq 'Y'}">, 흉통</c:if> --%>
-    <%--                                                 <c:if test="${info.noseCheck eq 'Y'}">, 콧물 또는 코 막힘</c:if> --%>
-    <%--                                                 <c:if test="${info.vomitingCheck eq 'Y'}">, 구토</c:if> --%>
-    <%--                                                 <c:if test="${info.musclePainCheck eq 'Y'}">, 근육통(몸살)</c:if> --%>
-    <%--                                                 <c:if test="${info.soreThroatCheck eq 'Y'}">, 인후통(목 아픔)</c:if> --%>
-    <%--                                                 <c:if test="${info.diarrheaCheck eq 'Y'}">, 설사</c:if> --%>
-    <%--                                                 <c:if test="${info.headacheCheck eq 'Y'}">, 두통(머리아픔)</c:if> --%>
-    <%--                                                 <c:if test="${info.dyspneaCheck eq 'Y'}">, 호흡곤란(숨가쁨)</c:if> --%>
-    <%--                                                 <c:if test="${info.fatigueCheck eq 'Y'}">, 권태감(피곤함)</c:if> --%>
-    <%--                                                 <c:if test="${info.ectCheckSymptom eq 'Y'}">, 기타(<c:out value="${info.etcContentSymptom}" />)</c:if> --%>
-                                                    <c:out value="${symptom}" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>
-                                                    체온
-                                                </th>
-                                                <td>
-                                                    <c:out value="우측 ${info.feverRight}℃ /  좌측  ${info.feverRight}℃" />
-                                                </td>
-                                                <th>
-                                                    맥박수
-                                                </th>
-                                                <td>
-                                                    <c:out value="${info.pulseRate} 회/분" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>
-                                                    호흡수
-                                                </th>
-                                                <td>
-                                                    <c:out value="${info.respirationRate} 회/분" />
-                                                </td>
-                                                <th>
-                                                    혈압
-                                                </th>
-                                                <td>
-                                                <c:out value="수축기 ${info.bloodPressureLevelCon} mmHg  /  이완기 ${info.bloodPressureLevelRel} mmHg" />
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>
-                                                    산소포화도
-                                                </th>
-                                                <td colspan="3">
-                                                    <c:out value="${info.oxygenSaturation} %" />
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        
+                                        <jsp:include page="${data._INCLUDE}/patientInfo.jsp"></jsp:include>
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div class="text-right">