diff --git a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
index 1f32fdb..000fa2c 100644
--- a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
+++ b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml
@@ -398,279 +398,229 @@
 
 	<!-- 요부과고지 및 납부실적 조회 [FN53] -->
 	<select id="findFinePmList" parameterType="cfs.fine.vo.FinePmVO" resultMap="findFinePmList-resultMap">
-		 SELECT YEAR,
-        YEAR || '/' || MONTH MONTH,
-        MOTION_ID,
-        MOTION_ID2,
-        GOJI_CNT,
-        GOJI_AMT,
-        NABU_CNT,
-        NABU_AMT,
-        DOB_CNT,
-        DOB_AMT,
-        R,
-        'gy' as name,
-        decode(R, 1, GAM_CNT, 0) GAM_CNT,
-        decode(R, 1, GAM_AMT, 0) GAM_AMT
-   FROM ( SELECT YEAR,
-                 MONTH,
-                 MOTION_ID,
-                 DECODE(MOTION_ID, '1', '차적조회', '2', '사전통지', '3', '1차고지', '4', '2차고지', '5', '민원처리', '7', '압류촉탁', '9', '수납완료') MOTION_ID2,
-                 SUM(GOJI_CNT) GOJI_CNT,
-                 SUM(GOJI_AMT) GOJI_AMT,
-                 SUM(NABU_CNT) NABU_CNT,
-                 SUM(NABU_AMT) NABU_AMT,
-                 SUM(DOB_CNT) DOB_CNT,
-                 SUM(DOB_AMT) DOB_AMT,
-                 RANK( ) OVER (PARTITION BY YEAR,
-                 MONTH
-           ORDER BY MOTION_ID) R,
-                 ( SELECT COUNT(*)
-                      FROM PENALTY_DETAIL_INFO_DAMO T
-                     WHERE A.YEAR = T.YEAR
-                       AND A.MONTH = T.MONTH 
+    SELECT YEAR
+         , (YEAR || '/' || MONTH) MONTH
+         , MOTION_ID
+         , MOTION_ID2
+         , GOJI_CNT
+         , GOJI_AMT
+         , NABU_CNT
+         , NABU_AMT
+         , DOB_CNT
+         , DOB_AMT
+         , R
+         , 'gy' as name
+         , decode(R, 1, GAM_CNT, 0) GAM_CNT
+         , decode(R, 1, GAM_AMT, 0) GAM_AMT
+      FROM ( SELECT YEAR
+                  , MONTH
+                  , MOTION_ID
+                  , DECODE(MOTION_ID, '1', '차적조회'
+                                    , '2', '사전통지'
+                                    , '3', '1차고지'
+                                    , '4', '2차고지'
+                                    , '5', '민원처리'
+                                    , '7', '압류촉탁'
+                                    , '9', '수납완료') MOTION_ID2
+                  , SUM(GOJI_CNT) GOJI_CNT
+                  , SUM(GOJI_AMT) GOJI_AMT
+                  , SUM(NABU_CNT) NABU_CNT
+                  , SUM(NABU_AMT) NABU_AMT
+                  , SUM(DOB_CNT) DOB_CNT
+                  , SUM(DOB_AMT) DOB_AMT
+                  , RANK( ) OVER (PARTITION BY YEAR, MONTH ORDER BY MOTION_ID) R
+                  , ( SELECT COUNT(*)
+                        FROM PENALTY_DETAIL_INFO_DAMO T
+                       WHERE A.YEAR = T.YEAR
+                         AND A.MONTH = T.MONTH 
+                         AND NOTICE_ID = '99'
+                         AND NOTICE_WRONG_ID = '01'
                        <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                       AND FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                         AND FARE_OFFICE_ID IN(#{fareOfficeId}) 
                        </if>
-                       AND NOTICE_ID = '99'
-                       AND NOTICE_WRONG_ID = '01') GAM_CNT,
-                 ( SELECT NVL(SUM(NVL(T.FINE_AMOUNT,
-                           0) + NVL(T.PASS_AMOUNT,
-                           0) ),
-                           0)
-                      FROM PENALTY_DETAIL_INFO_DAMO T
-                     WHERE A.YEAR = T.YEAR
-                       AND A.MONTH = T.MONTH 
+                    ) GAM_CNT
+                  , ( SELECT NVL(SUM(NVL(T.FINE_AMOUNT, 0) + NVL(T.PASS_AMOUNT, 0) ), 0)
+                        FROM PENALTY_DETAIL_INFO_DAMO T
+                       WHERE A.YEAR = T.YEAR
+                         AND A.MONTH = T.MONTH 
+                         AND NOTICE_ID = '99'
+                         AND NOTICE_WRONG_ID = '01'
                        <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                       AND FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                         AND FARE_OFFICE_ID IN(#{fareOfficeId}) 
                        </if>
-                       AND NOTICE_ID = '99'
-                       AND NOTICE_WRONG_ID = '01') GAM_AMT
-            FROM ( SELECT YEAR,
-                          MONTH,
-                          MOTION_ID,
-                          COUNT(*) AS GOJI_CNT,
-                          NVL(SUM(NVL(LAVY_AMOUNT,
-                          0) ),
-                          0) AS GOJI_AMT,
-                          0 NABU_CNT,
-                          0 NABU_AMT,
-                          0 GAM_CNT,
-                          0 GAM_AMT,
-                          0 DOB_CNT,
-                          0 DOB_AMT
-                     FROM ( SELECT A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) LAVY_AMOUNT,
-                                   SUBSTR(B.MOTION_ID,
-                                   1,
-                                   1) MOTION_ID
-                              FROM PENALTY_DETAIL_INFO_DAMO A,
-                                   SEND_INFO B
-                             WHERE A.PENALTY_MANAGE_YEAR =B.PENALTY_MANAGE_YEAR
-                               AND A.PENALTY_SEQNO =B.PENALTY_SEQNO 
+                    ) GAM_AMT
+               FROM ( SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
+                           , COUNT(*) AS GOJI_CNT
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0) AS GOJI_AMT
+                           , 0 NABU_CNT
+                           , 0 NABU_AMT
+                           , 0 GAM_CNT
+                           , 0 GAM_AMT
+                           , 0 DOB_CNT
+                           , 0 DOB_AMT
+                        FROM ( SELECT A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) LAVY_AMOUNT
+                                    , SUBSTR(B.MOTION_ID, 1, 1) MOTION_ID
+                                 FROM PENALTY_DETAIL_INFO_DAMO A
+                                    , SEND_INFO B
+                                WHERE A.PENALTY_MANAGE_YEAR = B.PENALTY_MANAGE_YEAR
+                                  AND A.PENALTY_SEQNO = B.PENALTY_SEQNO 
+                                  AND B.MOTION_ID NOT IN('71','72')
+                                  AND B.MOTION_ID IN ('11','13'
+                                                     ,'21','23','25'
+                                                     ,'31','33','35','37'
+                                                     ,'41','43','45','47','49'
+                                                     ,'51'
+                                                     ,'61'
+                                                     ,'71','77'
+                                                     ,'81'
+                                                     ,'91')
+                                  AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31' 
                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                               AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                                  AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
                                </if>
-                               AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31' 
                                <if test= "!motionId.equals('all')" >
-                               AND SUBSTR(B.MOTION_ID,
-                                   1,
-                                   1) IN(#{motionId}) 
-                                   </if>
-                               AND B.MOTION_ID NOT IN('71',
-                                   '72')
-                               AND B.MOTION_ID IN('11',
-                                   '13',
-                                   '21',
-                                   '23',
-                                   '25',
-                                   '31',
-                                   '33',
-                                   '35',
-                                   '37',
-                                   '41',
-                                   '43',
-                                   '45',
-                                   '47',
-                                   '49',
-                                   '51',
-                                   '61',
-                                   '71',
-                                   '77',
-                                   '81',
-                                   '91')
-                             GROUP BY A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   SUBSTR(B.MOTION_ID,
-                                   1,
-                                   1),
-                                   A.PENALTY_SEQNO,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) )
-                    GROUP BY YEAR,
-                          MONTH,
-                          MOTION_ID
+                                  AND SUBSTR(B.MOTION_ID, 1, 1) IN (#{motionId}) 
+                               </if>
+                             GROUP BY A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , SUBSTR(B.MOTION_ID, 1, 1)
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0)
+                             )
+                    GROUP BY YEAR
+                           , MONTH
+                           , MOTION_ID
                     UNION ALL
-                   SELECT YEAR,
-                          MONTH,
-                          '7' MOTION_ID,
-                          COUNT(*),
-                          NVL(SUM(NVL(LAVY_AMOUNT,
-                          0) ),
-                          0),
-                          0 NABU_CNT,
-                          0 NABU_AMT,
-                          0 GAM_CNT,
-                          0 GAM_AMT,
-                          0 DOB_CNT,
-                          0 DOB_AMT
-                     FROM ( SELECT A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) LAVY_AMOUNT
-                              FROM PENALTY_DETAIL_INFO_DAMO A,
-                                   SEIZURE_INFO B
-                             WHERE A.SEIZURE_MANAGE_YEAR = B.SEIZURE_MANAGE_YEAR
-                               AND A.SEIZURE_MANAGE_NO = B.SEIZURE_MANAGE_NO 
+                      SELECT YEAR
+                           , MONTH
+                           , '7' MOTION_ID
+                           , COUNT(*)
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0)
+                           , 0 NABU_CNT
+                           , 0 NABU_AMT
+                           , 0 GAM_CNT
+                           , 0 GAM_AMT
+                           , 0 DOB_CNT
+                           , 0 DOB_AMT
+                        FROM ( SELECT A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT,0) + NVL(A.PASS_AMOUNT,0) LAVY_AMOUNT
+                                 FROM PENALTY_DETAIL_INFO_DAMO A
+                                    , SEIZURE_INFO B
+                                WHERE A.SEIZURE_MANAGE_YEAR = B.SEIZURE_MANAGE_YEAR
+                                  AND A.SEIZURE_MANAGE_NO = B.SEIZURE_MANAGE_NO 
+                                  AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                               AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                                  AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
                                </if>
-                               AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
                                <if test= "!motionId.equals('all')" >
-                               AND '7' in(#{motionId}) 
+                                  AND '7' IN (#{motionId}) 
                                </if>
-                             GROUP BY A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) )
-                    GROUP BY YEAR,
-                          MONTH
+                             GROUP BY A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) 
+                             )
+                    GROUP BY YEAR
+                           , MONTH
                     UNION ALL
-                   SELECT YEAR,
-                          MONTH,
-                          MOTION_ID,
-                          0 GOJI_CNT,
-                          0 GIJI_AMT,
-                          COUNT(*) AS N_CNT,
-                          NVL(SUM(NVL(LAVY_AMOUNT,
-                          0) ),
-                          0) AS N_AMOUNT,
-                          0 GAM_CNT,
-                          0 GAM_AMT,
-                          0 DOB_CNT,
-                          0 DOB_AMT
-                     FROM ( SELECT A.YEAR,
-                                   A.MONTH,
-                                   SUBSTR(B.RECEIPT_ID,
-                                   1,
-                                   1) MOTION_ID,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) LAVY_AMOUNT
-                              FROM PENALTY_DETAIL_INFO_DAMO A,
-                                   RECEIPT_INFO B
-                             WHERE A.PENALTY_MANAGE_YEAR =B.PENALTY_MANAGE_YEAR
-                               AND A.PENALTY_SEQNO =B.PENALTY_SEQNO 
+                      SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
+                           , 0 GOJI_CNT
+                           , 0 GIJI_AMT
+                           , COUNT(*) AS N_CNT
+                           , NVL(SUM(NVL(LAVY_AMOUNT, 0)), 0) AS N_AMOUNT
+                           , 0 GAM_CNT
+                           , 0 GAM_AMT
+                           , 0 DOB_CNT
+                           , 0 DOB_AMT
+                        FROM ( SELECT A.YEAR
+                                    , A.MONTH
+                                    , SUBSTR(B.RECEIPT_ID, 1, 1) MOTION_ID
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) LAVY_AMOUNT
+                                 FROM PENALTY_DETAIL_INFO_DAMO A
+                                    , RECEIPT_INFO B
+                                WHERE A.PENALTY_MANAGE_YEAR = B.PENALTY_MANAGE_YEAR
+                                  AND A.PENALTY_SEQNO = B.PENALTY_SEQNO 
+                                  AND B.RECEIPT_ID IN ('11','13'
+                                                      ,'21','23','25'
+                                                      ,'31','33','35','37'
+                                                      ,'41','43','45','47','49'
+                                                      ,'51'
+                                                      ,'61'
+                                                      ,'71','77'
+                                                      ,'81')
+                                  AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                               AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                                  AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
                                </if>
-                               AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
                                <if test= "!motionId.equals('all')" >
-                               AND SUBSTR(B.RECEIPT_ID,1,1) IN(#{motionId}) 
+                                  AND SUBSTR(B.RECEIPT_ID, 1, 1) IN (#{motionId}) 
                                </if>
-                               AND B.RECEIPT_ID IN('11',
-                                   '13',
-                                   '21',
-                                   '23',
-                                   '25',
-                                   '31',
-                                   '33',
-                                   '35',
-                                   '37',
-                                   '41',
-                                   '43',
-                                   '45',
-                                   '47',
-                                   '49',
-                                   '51',
-                                   '61',
-                                   '71',
-                                   '77',
-                                   '81') )
-                    GROUP BY YEAR,
-                          MONTH,
-                          MOTION_ID
+                             )
+                    GROUP BY YEAR
+                           , MONTH
+                           , MOTION_ID
                     UNION ALL
-                   SELECT YEAR,
-                          MONTH,
-                          MOTION_ID,
-                          0 GOJI_CNT,
-                          0 GOJI_AMT,
-                          0 NABU_CNT,
-                          0 NABU_AMT,
-                          0 GAM_CNT,
-                          0 GAM_AMT,
-                          SUM(DOB_CNT) DOB_CNT,
-                          SUM(DOB_AMT) DOB_AMT
-                     FROM ( SELECT A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   SUBSTR(A.BEFORE_MOTION_ID,
-                                   1,
-                                   1) MOTION_ID,
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) DOB_AMT,
-                                   1 DOB_CNT
-                              FROM PENALTY_DETAIL_INFO_DAMO A
-                             WHERE 1 = 1 
-                             <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
-                               AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
-                             </if>
-                               AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
-                               AND A.MOTION_ID NOT IN('11','12','13') 
-                                   <if test= "!motionId.equals('all')" >
-                               AND SUBSTR(a.MOTION_ID,
-                                   1,
-                                   1) IN(#{motionId}) 
-                                   </if>
-                               and a.C_LOSS = '1'
-                             GROUP BY A.YEAR,
-                                   A.MONTH,
-                                   A.PENALTY_MANAGE_YEAR,
-                                   A.PENALTY_SEQNO,
-                                   SUBSTR(A.BEFORE_MOTION_ID,
-                                   1,
-                                   1),
-                                   NVL(A.FINE_AMOUNT,
-                                   0) + NVL(A.PASS_AMOUNT,
-                                   0) )
-                    GROUP BY YEAR,
-                          MOTION_ID,
-                          MONTH) A
-           GROUP BY YEAR,
-                 MONTH,
-                 MOTION_ID) A
-  ORDER BY 1,
-        2,
-        3
-
+                      SELECT YEAR
+                           , MONTH
+                           , MOTION_ID
+                           , 0 GOJI_CNT
+                           , 0 GOJI_AMT
+                           , 0 NABU_CNT
+                           , 0 NABU_AMT
+                           , 0 GAM_CNT
+                           , 0 GAM_AMT
+                           , SUM(DOB_CNT) DOB_CNT
+                           , SUM(DOB_AMT) DOB_AMT
+                        FROM ( SELECT A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , SUBSTR(A.BEFORE_MOTION_ID, 1, 1) MOTION_ID
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0) DOB_AMT
+                                    , 1 DOB_CNT
+                                 FROM PENALTY_DETAIL_INFO_DAMO A
+                                WHERE A.C_LOSS = '1'
+                                  AND A.MOTION_ID NOT IN('11','12','13')
+                                  AND A.PASS_DATE BETWEEN #{inStDate}||'01' AND #{inEdDate}||'31'
+                                <if test= "fareOfficeId!=null and !fareOfficeId.equals('')" >
+                                  AND A.FARE_OFFICE_ID IN(#{fareOfficeId}) 
+                                </if>
+                                <if test= "!motionId.equals('all')" >
+                                  AND SUBSTR(a.MOTION_ID, 1, 1) IN (#{motionId}) 
+                                </if>
+                             GROUP BY A.YEAR
+                                    , A.MONTH
+                                    , A.PENALTY_MANAGE_YEAR
+                                    , A.PENALTY_SEQNO
+                                    , SUBSTR(A.BEFORE_MOTION_ID, 1, 1)
+                                    , NVL(A.FINE_AMOUNT, 0) + NVL(A.PASS_AMOUNT, 0)
+                             )
+                    GROUP BY YEAR
+                           , MOTION_ID
+                           , MONTH
+                    ) A
+           GROUP BY YEAR
+                  , MONTH
+                  , MOTION_ID
+           ) A
+  ORDER BY 1
+         , 2
+         , 3
 	</select>
 
 	<!-- 비부과 대상차량 현황[FN54], 비부과 대상차량 내용 현황[FN055] -->