system권한 전체메뉴 오픈 / 수정은 불가능하도록

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

@@ -78,7 +78,16 @@
         ]]>
     </if>
         <![CDATA[
-             ORDER BY PATIENT_NAME ASC
+             ORDER BY 
+        ]]>
+        
+    <if test='groupIdx == "1"'>
+        <![CDATA[
+                      center_code,
+        ]]>
+    </if>
+        <![CDATA[
+                      PATIENT_NAME ASC
              LIMIT ${limit}, ${limitMax}
         ]]>
     </select>

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

@@ -21,8 +21,14 @@
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
                AND (M.GROUP_IDX = 2 OR M.GROUP_IDX = 3)
-               AND M.CENTER_CODE = #{centerCode}
         ]]>
+        
+        <if test='groupIdx != "1"'>
+            <![CDATA[
+               AND M.CENTER_CODE = #{centerCode}
+            ]]>
+        </if>
+        
         <if test='groupIdx != null and groupIdx != "" and groupIdx == "3"'>
             <![CDATA[
                 AND M.ID = #{sesId}
@@ -73,8 +79,14 @@
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
                AND (M.GROUP_IDX = 2 OR M.GROUP_IDX = 3)
-               AND M.CENTER_CODE = #{centerCode}
         ]]>
+        
+        <if test='groupIdx != "1"'>
+            <![CDATA[
+               AND M.CENTER_CODE = #{centerCode}
+            ]]>
+        </if>
+        
         <if test='groupIdx != null and groupIdx != "" and groupIdx == "3"'>
             <![CDATA[
                 AND M.ID = #{sesId}

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

@@ -13,7 +13,7 @@
             <li class="sidebar-header">관리자</li>
             <li class="sidebar-item active">
                 <ul id="dashboards" class="sidebar-dropdown list-unstyled collapse show" data-parent="#sidebar">
-                    <c:if test="${data._SES_GROUP_IDX ne 1}">
+<%--                     <c:if test="${data._SES_GROUP_IDX ne 1}"> --%>
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "patient"}'>active</c:if>">
                             <a class="sidebar-link" href="/patient/list">환자관리</a>
                         </li>
@@ -23,7 +23,7 @@
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "staff"}'>active</c:if>">
                             <a class="sidebar-link" href="/staff/list">의료진관리</a>
                         </li>
-                    </c:if>
+<%--                     </c:if> --%>
                     
                     <c:if test="${data._SES_GROUP_IDX eq 1}">
                         <li class="sidebar-item <c:if test='${data._MENUPATH eq "center"}'>active</c:if>">

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

@@ -235,7 +235,7 @@ $( function(){
                                                             <!-- 입소일시 -->
                                                             <fmt:parseDate var="hospitalizationDate" value="${patientData.hospitalizationDate}" pattern="yyyy-MM-dd HH:mm" />
                                                             <c:set var="sysYmd"><fmt:formatDate value="${hospitalizationDate}" pattern="yyyy-MM-dd" /></c:set>
-                                                            <c:set var="sysHour"><fmt:formatDate value="${hospitalizationDate}" pattern="h" /></c:set> 
+                                                            <c:set var="sysHour"><fmt:formatDate value="${hospitalizationDate}" pattern="H" /></c:set> 
                                                             <c:set var="sysMin"><fmt:formatDate value="${hospitalizationDate}" pattern="m" /></c:set>
                                                              
                                                             <div class="col-6 calendar-bar">
@@ -243,6 +243,7 @@ $( function(){
                                                                 <i class="align-middle mr-2 fas fa-fw fa-calendar-alt"></i>
                                                             </div>
                                                             <div class="col-3">
+                                                            
                                                                 <select class="custom-select hospitalizationDate" id="hospitalizationDateHour">
                                                                       <option value="" selected="">시</option>
                                                                       <c:forEach var="h" begin="1" end="24" step="1">

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

@@ -263,7 +263,9 @@ function nonFaceStart() {
                                     <div class="row mt-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <button type="button" class="btn btn-secondary w100" onclick="location.href='./edit?patientIdx=${patientIdx}';">수정</button>
+                                                <c:if test="${data._SES_GROUP_IDX ne '1'}">
+                                                    <button type="button" class="btn btn-secondary w100" onclick="location.href='./edit?patientIdx=${patientIdx}';">수정</button>
+                                                </c:if>
                                                 <button type="button" class="btn btn-primary w100" onclick="location.href='./list';">확인</button>
                                             </div>
                                         </div>

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

@@ -203,7 +203,7 @@ $( function(){
                                         <table class="table mobile-table">
                                             <tr>
                                               <th>치료센터</th>
-                                              <td class="text-danger">등록된 생활치료센터가 없습니다. <br/>생활치료센터 신규 등록을 해주세요. </td>
+                                              <td class="text-danger">등록된 생활치료센터가 없거나<br/>환자 신규등록 권한이 없습니다. </td>
                                             </tr>
                                         </table>
                                     </c:if>
@@ -228,7 +228,7 @@ $( function(){
                                                         <div class="form-row">
                                                             <!-- 입소일시 -->
                                                             <c:set var="sysYmd"><fmt:formatDate value="${now}" pattern="yyyy-MM-dd" /></c:set>
-                                                            <c:set var="sysHour"><fmt:formatDate value="${now}" pattern="h" /></c:set>
+                                                            <c:set var="sysHour"><fmt:formatDate value="${now}" pattern="H" /></c:set>
                                                             <c:set var="sysMin"><fmt:formatDate value="${now}" pattern="m" /></c:set>
                                                              
                                                             <div class="col-6 calendar-bar">

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

@@ -61,13 +61,14 @@ function reset() {
                                     <div class="row mb-3">
                                         <div class="col-12">
                                             <div class="text-right">
-                                                <c:if test="${info.id eq sesId}">
-                                                    <button class="btn btn-secondary w100" onclick="location.href='./myinfo';">내정보 변경</button>
-                                                </c:if>
-                                                
-                                                
-                                                <c:if test="${info.id ne sesId}">
-                                                    <button class="btn btn-secondary w100" onclick="location.href='./edit?staffId=${info.id}';">수정</button>
+                                                <c:if test="${data._SES_GROUP_IDX ne '1'}">
+                                                    <c:if test="${info.id eq sesId}">
+                                                        <button class="btn btn-secondary w100" onclick="location.href='./myinfo';">내정보 변경</button>
+                                                    </c:if>
+                                                    
+                                                    <c:if test="${info.id ne sesId}">
+                                                        <button class="btn btn-secondary w100" onclick="location.href='./edit?staffId=${info.id}';">수정</button>
+                                                    </c:if>
                                                 </c:if>
                                             </div>
                                         </div>
@@ -145,7 +146,9 @@ function reset() {
                                         <div class="col-12">
                                             <div class="text-right">
                                                 <c:if test="${info.id ne sesId}">
-                                                    <button class="btn btn-warning w150" onclick="reset();">비밀번호 초기화</button>
+                                                    <c:if test="${data._SES_GROUP_IDX ne '1'}">
+                                                        <button class="btn btn-warning w150" onclick="reset();">비밀번호 초기화</button>
+                                                    </c:if>
                                                 </c:if>
                                                 <button class="btn btn-primary w100" onclick="location.href='./list';">확인</button>
                                             </div>