diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 7b1bcc59..1fd03010 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2773,6 +2773,7 @@ SELECT zab.CREATED_DATE_TIME,
                  JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER
                  LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE
                  CROSS JOIN M_MONTH
+        WHERE ZSD.WORK_CENTER IN ('JJ','HJ','RC')
         GROUP BY WCT.DESCRIPTION, M_MONTH.MONTH
         ORDER BY WCT.DESCRIPTION, M_MONTH.MONTH
     </select>
@@ -3228,7 +3229,7 @@ SELECT zab.CREATED_DATE_TIME,
     </select>
     <select id="workingHoursYearContrast" resultType="java.util.Map">
         WITH M_MONTH AS (
-            SELECT TO_CHAR(ADD_MONTHS(TRUNC(SYSDATE), + ROWNUM - 24), 'yyyy-MM') MONTH
+            SELECT TO_CHAR(ADD_MONTHS(TRUNC(last_day(add_months(trunc(SYSDATE, 'y'), 11))), + ROWNUM - 24), 'yyyy-MM') MONTH
             FROM DUAL
         CONNECT BY 24 >= ROWNUM)
         SELECT SUBSTR(M_MONTH.MONTH,0,4)               CON_YEAR,
@@ -3243,33 +3244,33 @@ SELECT zab.CREATED_DATE_TIME,
         ORDER BY M_MONTH.MONTH
     </select>
     <select id="sixWorkCenterHoursQTY" resultType="java.util.LinkedHashMap">
-        SELECT SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) JJ_DONE,
-               SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) HJ_DONE,
-               SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) RC_DONE,
-               SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+        SELECT ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) JJ_DONE,
+               ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) HJ_DONE,
+               ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS = 'COMPLETE' OR ZSD.DISPATCH_STATUS != 'CANCEL')
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) RC_DONE,
+               ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'JJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
                                                 ZSD.DISPATCH_STATUS != 'COMPLETE')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) JJ_UNFINISD,
-               SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) JJ_UNFINISD,
+               ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'HJ' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
                                                 ZSD.DISPATCH_STATUS != 'COMPLETE')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) HJ_UNFINISD,
-               SUM(CASE
-                       WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) HJ_UNFINISD,
+               ceil(SUM(CASE
+                            WHEN ZSD.WORK_CENTER = 'RC' AND (ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
                                                 ZSD.DISPATCH_STATUS != 'COMPLETE')
-                           THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
-                       ELSE 0 END) RC_UNFINISD
+                                THEN ZSD.PROD_HOURS * ZSD.DISPATCH_QTY
+                            ELSE 0 END)) RC_UNFINISD
         FROM Z_SFC_DISPATCH ZSD
     </select>
     <select id="totalWorkingHoursCompletedThisYear" resultType="java.util.Map">