Merge remote-tracking branch 'origin/simplatform' into databank

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

@@ -889,6 +889,10 @@ $(document).ready(function() {
   });
 
   // 환자정보 플로팅 레이어 삽입
+  let wardNumber = '<c:out value="${info.wardNumber}" />';
+  if (wardNumber) {
+    wardNumber = wardNumber + "동 ";
+  }
   const roomNumber = '<c:out value="${info.roomNumber}" />';
   const patientName = '<c:out value="${info.patientName}" />';
   const patientGender = '<c:out value="${info.gender=='M'?'남':'여'}" />';
@@ -898,7 +902,7 @@ $(document).ready(function() {
   <fmt:formatDate value="${birthDate}" pattern="yyyy" var="birthYear"/>
   <c:set var="age" value="${sysYear-birthYear}" />
   const patientYearsOld = '<c:out value="${age}" />';
-  const patientInfoContent = ''+roomNumber+'호 '+patientName+' ('+patientGender+'/'+patientYearsOld+') 환자';
+  const patientInfoContent = ''+wardNumber+roomNumber+'호 '+patientName+' ('+patientGender+'/'+patientYearsOld+') 환자';
   const patientInfoFloatHTML = '<div class="patientInfoFloat" style="display: none">'+patientInfoContent+' <button id="showInfo" type="button" class="btn btn-primary ml-2"><i class="mdi mdi-information-outline"></i> 기본 정보</button></div>';
   $('.main').prepend(patientInfoFloatHTML);
 

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

@@ -275,7 +275,7 @@ function responsiblePagination() {
 	if(window_width < 600){
 		$('#pagination').bootpag({
 			maxVisible: 3, // 한번에 보여지는 페이지수
-			firstLastUse: false
+			firstLastUse: true
 		});
 	}
 }