Merge remote-tracking branch 'origin/databank'

src/main/java/com/lemon/lifecenter/controller/PatientController.java

@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -111,8 +113,14 @@ public class PatientController extends LifeCenterController {
         }
         
         ModelAndView mv = setMV("patient/list");
+        String param = "";
+        try {
+            param = "patientName=" + URLEncoder.encode(patientName, "UTF-8") + "&inputState=" + inputState + "&startDate=" + startDate + "&endDate=" + endDate + "&sortType=" + sortType + "&sort=" + sort;
+        } catch (UnsupportedEncodingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
         
-        String param = "patientName=" + patientName + "&inputState=" + inputState + "&startDate=" + startDate + "&endDate=" + endDate + "&sortType=" + sortType + "&sort=" + sort;
         paging = LifeCenterPaging.getInstance();
         paging.paging(config, total, page, param);
         

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

@@ -80,13 +80,13 @@ $( function(){
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "push"}'>active</c:if>">
                             <a class="sidebar-link" href="/push/list">푸시 서비스 관리(테스트)</a>
                         </li>
-                    </c:if>
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "notice"}'>active</c:if>">
                             <a class="sidebar-link" href="/notice/list">공지사항</a>
                         </li>
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "qna"}'>active</c:if>">
                             <a class="sidebar-link" href="/qna/list">의견 게시판</a>
                         </li>
+                    </c:if>
                 </ul>
             </li>
         </ul>