생치 현황 통계 수정요청사항 (완료) 11번슬라이드까지

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

@@ -171,6 +171,8 @@ public class StaffTotalManagerController extends LifeCenterController {
                             dto.setStatusFlag("I");
                             tmpdto = service.selectStaffManagerInfo(dto);
                             
+                            tmpdto.setUnavailableTotal( 0 );
+                            tmpdto.setUnavailableNote( "" );
                             tmpdto.setCenterCode(Integer.valueOf(sesCenterCode));
                             tmpdto.setGubun(inputgubun);
                             tmpdto.setRegistDay(date.format(cal.getTime()));

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

@@ -55,8 +55,11 @@
                    CI.JURISDICTION                                    AS jurisdiction,
                    CI.CENTER_ADDRESS                                  AS centerAddress,
                    CI.CENTER_NUMBER                                   AS centerNumber,
-                   CI.TOTAL_CAPACITY                                  AS totalCapacity,
-                   CI.TOTAL_STAFF                                     AS totalStaff,
+                   -- CI.TOTAL_CAPACITY                                  AS totalCapacity,
+                   -- CI.TOTAL_STAFF                                     AS totalStaff,
+                   NVL( ( STAFF1 + STAFF2 + STAFF3 + STAFF4 + STAFF5 + STAFF6 + STAFF7 + STAFF8 + STAFF9 + STAFF10 
+                      + STAFF11 + STAFF12 + STAFF13 + STAFF14 + STAFF15 ), 0 ) AS totalStaff,
+                   NVL( SM.STAFF_CAPACITY, 0 ) AS totalCapacity,
                    DATE_FORMAT(CI.CREATE_DATE, '%Y-%m-%d')      AS createDate,
                    DATE_FORMAT(CI.UPDATE_DATE, '%Y-%m-%d %H:%i')      AS updateDate,
                    M.ID                                               AS staffId,
@@ -67,6 +70,13 @@
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
+              LEFT JOIN ( SELECT * 
+                            FROM STAFF_MANAGER 
+                           WHERE GUBUN = 'm' 
+                             AND CENTER_CODE = CI.CENTER_CODE
+                           ORDER BY REGIST_DAY DESC 
+                           LIMIT 1 ) SM
+                ON SM.CENTER_CODE = CI.CENTER_CODE
              WHERE CI.CENTER_CODE = #{centerCode}
                AND M.GROUP_IDX = 2
         ]]>
@@ -120,8 +130,11 @@
                    M.PHONE_NUMBER                                AS staffPhoneNumber,
                    CI.CENTER_NUMBER                              AS centerNumber,
                    CI.TOTAL_PATIENT                              AS totalPatient,
-                   (SELECT COUNT(*) FROM member WHERE center_code = CI.center_code) AS totalStaff,
-                   CI.TOTAL_CAPACITY                             AS totalCapacity,
+                   -- (SELECT COUNT(*) FROM member WHERE center_code = CI.center_code) AS totalStaff,
+                   -- CI.TOTAL_CAPACITY                             AS totalCapacity,
+                   NVL( ( STAFF1 + STAFF2 + STAFF3 + STAFF4 + STAFF5 + STAFF6 + STAFF7 + STAFF8 + STAFF9 + STAFF10 
+                      + STAFF11 + STAFF12 + STAFF13 + STAFF14 + STAFF15 ), 0 ) AS totalStaff,
+                   NVL( SM.STAFF_CAPACITY, 0 ) AS totalCapacity,
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'H' ) AS totalPatientH,
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'D' ) AS totalPatientD,
                    ( SELECT COUNT(*) FROM patient_care WHERE center_code = CI.center_code AND state = 'T' ) AS totalPatientT,
@@ -135,6 +148,13 @@
               FROM CENTER_INFO CI
               LEFT OUTER JOIN MEMBER M
                 ON CI.CENTER_CODE = M.CENTER_CODE
+              LEFT JOIN ( SELECT * 
+                            FROM STAFF_MANAGER 
+                           WHERE GUBUN = 'm' 
+                             AND CENTER_CODE = CI.CENTER_CODE
+                           ORDER BY REGIST_DAY DESC 
+                           LIMIT 1 ) SM
+                ON SM.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
                AND M.GROUP_IDX = 2
         ]]>

src/main/resources/mybatis/mapper/staffTotal/staffManager.xml

@@ -6,7 +6,7 @@
         <![CDATA[
             SELECT COUNT(*) AS TOTAL
               FROM CENTER_INFO CI
-              LEFT JOIN STAFF_MANAGER SM
+              LEFT JOIN ( SELECT * FROM STAFF_MANAGER WHERE GUBUN = #{gubun} AND REGIST_DAY <= DECODE(#{registDay}, '', TO_CHAR(NOW(),'YYYY-MM-DD'), #{registDay}) ) AS SM
                 ON CI.CENTER_CODE = SM.CENTER_CODE
                AND SM.GUBUN = #{gubun}
             WHERE 1 = 1
@@ -231,7 +231,7 @@
                  UNAVAILABLE_TOTAL                                       AS unavailableTotal,
                  UNAVAILABLE_NOTE                                        AS unavailableNote
             FROM CENTER_INFO CI
-            LEFT JOIN STAFF_MANAGER SM
+            LEFT JOIN ( SELECT * FROM STAFF_MANAGER WHERE GUBUN = #{gubun} AND REGIST_DAY <= DECODE(#{registDay}, '', TO_CHAR(NOW(),'YYYY-MM-DD'), #{registDay}) ) AS SM
               ON CI.CENTER_CODE = SM.CENTER_CODE
              AND SM.GUBUN = #{gubun}
            WHERE 1=1
@@ -420,7 +420,7 @@
                    SUM( UNAVAILABLE_TOTAL )                                      AS unavailableTotal,
                    UNAVAILABLE_NOTE                                              AS unavailableNote
               FROM CENTER_INFO CI
-              LEFT JOIN STAFF_MANAGER SM
+              LEFT JOIN ( SELECT * FROM STAFF_MANAGER WHERE NVL(GUBUN, 'm') = 'm' AND REGIST_DAY <= DECODE(#{registDay}, '', TO_CHAR(NOW(),'YYYY-MM-DD'), #{registDay}) ) AS SM
                 ON CI.CENTER_CODE = SM.CENTER_CODE
                 AND SM.GUBUN = 'm'
               WHERE 1=1

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

@@ -193,12 +193,12 @@ $( function(){
                                             </tr>
                                             <tr>
                                                 <th><span class="fix">*</span>정원</th>
-                                                <td>
-                                                    <input type="text" class="form-control" name="totalCapacity" value="${centerInfo.totalCapacity}" required onkeypress="onlyNumber();">
+                                                <td><c:out value="${centerInfo.totalCapacity}"/>
+<%--                                                     <input type="text" class="form-control" name="totalCapacity" value="${centerInfo.totalCapacity}" required onkeypress="onlyNumber();"> --%>
                                                 </td>
                                                 <th><span class="fix">*</span>의료진수 (명)</th>
-                                                <td>
-                                                    <input type="text" class="form-control" name="totalStaff" value="${centerInfo.totalStaff}" required onkeypress="onlyNumber();">
+                                                <td><c:out value="${centerInfo.totalStaff}"/>
+<%--                                                     <input type="text" class="form-control" name="totalStaff" value="${centerInfo.totalStaff}" required onkeypress="onlyNumber();"> --%>
                                                 </td>
                                             </tr>
                                             <tr>

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

@@ -170,16 +170,18 @@ $( function(){
                                                     <input type="text" class="form-control" name="centerNumber" required onkeypress="onlyNumber()">
                                                 </td>
                                             </tr>
-                                            <tr>
+                                            
+                                            <tr style="display:none;">
                                                 <th><span class="fix">*</span>수용인원(명)</th>
                                                 <td>
-                                                    <input type="text" class="form-control" name="totalCapacity" required>
+                                                    <input type="text" class="form-control" name="totalCapacity" value="0">
                                                 </td>
                                                 <th><span class="fix">*</span>의료진수 (명)</th>
                                                 <td>
-                                                    <input type="text" class="form-control" name="totalStaff" required>
+                                                    <input type="text" class="form-control" name="totalStaff" value="0">
                                                 </td>
                                             </tr>
+                                            
                                             <tr>
                                                 <th><span class="fix">*</span>담당자 아이디</th>
                                                 <td>