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

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

@@ -560,7 +560,7 @@ $(document).ready(function() {
                     <div class="searchTools col-lg-4 form-horizontal">
                       <div class="searchPatient mb-2">
                         <span>검색</span>
-                        <input type="text" class="form-control w150" id="searchKeyword" placeholder="호실 or 환자명" value="${searchText}" onkeyup="if(event.keyCode===13){searchPatients()}"/>
+                        <input type="text" class="form-control w150" id="searchKeyword" placeholder="호실 or 환자명" value='<c:out value="${searchText}"/>' onkeyup="if(event.keyCode===13){searchPatients()}"/>
                         <button id="searchKeywordBtn" class="btn btn-primary" onclick="searchPatients()"><i class="mdi mdi-magnify"></i></button>
                       </div>
                     </div>