Преглед на файлове

생치현황 통계 수정

huiwon.seo преди 4 години
родител
ревизия
1d239fbede
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 1 3
      src/main/resources/mybatis/mapper/staffTotal/staffManager.xml
  2. 3 1
      src/main/webapp/WEB-INF/jsp/staffTotal/report/list.jsp

+ 1 - 3
src/main/resources/mybatis/mapper/staffTotal/staffManager.xml

@@ -414,9 +414,7 @@
                       FROM LOCATION_INFO LI
                      WHERE CI.LOCATION_CODE = LI.LOCATION_CODE)                  AS locationName,
                    NVL(SUM(SM.STAFF_CAPACITY ), 0)                               AS staffCapacity,
-                   SUM(STAFF1 + STAFF2 + STAFF3 + STAFF4 + STAFF5 +
-                       STAFF6 + STAFF7 + STAFF8 + STAFF9 + STAFF10 +
-                       STAFF11 + STAFF12 + STAFF13 + STAFF14 + STAFF15)          AS staffTotal,
+                   DECODE( CI.CENTER_CODE, null, ( SELECT COUNT(*) FROM patient_care WHERE state = 'H' AND CENTER_CODE != 1 ), ( SELECT COUNT(*) FROM patient_care WHERE state = 'H' AND CENTER_CODE = CI.CENTER_CODE AND CENTER_CODE != 1 ) ) AS staffTotal,
                    SUM( UNAVAILABLE_TOTAL )                                      AS unavailableTotal,
                    UNAVAILABLE_NOTE                                              AS unavailableNote
               FROM CENTER_INFO CI

+ 3 - 1
src/main/webapp/WEB-INF/jsp/staffTotal/report/list.jsp

@@ -228,7 +228,9 @@ function getExcel(){
                                                                 </td>
                                                                 <td><c:out value="${l.locationName}" /><c:if test="${l.locationName eq ''}">-</c:if>
                                                                 <td><fmt:formatNumber value="${l.staffCapacity}" pattern="#,###" /></td>
-                                                                <td><fmt:formatNumber value="${l.staffTotal}" pattern="#,###" /></td>
+                                                                <td>
+                                                                    <fmt:formatNumber value="${l.staffTotal}" pattern="#,###" />
+                                                                </td>
                                                                 <td><c:out value="${l.rate}" />%</td>
                                                                 <td><fmt:formatNumber value="${l.staff1}" pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value="${l.staff1 - l.unavailableTotal}" pattern="#,###" /></td>