diff --git a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml
index 766cb5e..c956a5a 100644
--- a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml
+++ b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml
@@ -948,13 +948,12 @@
 			A.VLTN_TYPE	,
       		B.CODENM  || ' (' || A.VLTN_DTL || ')'	VLTN_DTL,
 			A.IVSN_TYPE	,
-			DECODE(A.IVSN_TYPE, 'YRB2', 1, 0) IVSN_TYPE1,
-			DECODE(A.IVSN_TYPE, 'YRD1', 1, 0) IVSN_TYPE2,
-			DECODE(A.IVSN_TYPE, 'YRA1', 1, 0) IVSN_TYPE3,
-			DECODE(A.IVSN_TYPE, 'YRB1', 1, 0) IVSN_TYPE4,
-			
-			DECODE(A.SPEC_BATL_YN , 'Y', 1, 0) SPEC_BATL,
-			DECODE(A.NLL_YN	, 'Y', 1, 0) NLL,
+			case A.IVSN_TYPE when 'YRB2' then 1 else 0 end IVSN_TYPE1,
+			case A.IVSN_TYPE when 'YRD1' then 1 else 0 end IVSN_TYPE2,
+			case A.IVSN_TYPE when 'YRA1' then 1 else 0 end IVSN_TYPE3,
+			case A.IVSN_TYPE when 'YRB1' then 1 else 0 end IVSN_TYPE4,
+			case A.SPEC_BATL_YN when 'Y' then 1 else 0 end SPEC_BATL,
+			case A.NLL_YN when 'Y' then 1 else 0 end  NLL,
 			A.AGENCY_TYPE	,
 			A.AGENCY_GUARD	,
 			G.CODENM AGENCY_GUARD_STR ,
@@ -975,21 +974,26 @@
 			A.VIO_CNT	,
 			A.VIO_PRTD_AMT	,
 			A.PROC_COND	,
-			DECODE(A.PROC_COND, '01', 1, 0) PROC_COND1,
-			DECODE(A.PROC_COND, '02', 1, 0) PROC_COND2,
+			case A.PROC_COND when '01' then 1 else 0 end PROC_COND1,
+			case A.PROC_COND when '02' then 1 else 0 end PROC_COND2,
 			A.MRGN_PYMT_YN	,
-			DECODE(A.MRGN_PYMT_YN, 'N', 1, 0) PYMT_N_CNT,
-			--A.MRGN_PYMT_AMT	,
-			DECODE(MRGN_PYMT_YN, 'Y', MRGN_PYMT_AMT, 0) MRGN_PYMT_AMT,
-			DECODE(MRGN_PYMT_YN, 'N', MRGN_PYMT_AMT, 0) NO_MRGN_PYMT_AMT,
+			case MRGN_PYMT_YN
+				when 'Y' then MRGN_PYMT_AMT
+				else 0
+			end MRGN_PYMT_AMT,
+			case MRGN_PYMT_YN
+				when 'N' then MRGN_PYMT_AMT
+				else 0
+			end NO_MRGN_PYMT_AMT,
+			case A.MRGN_PYMT_YN when 'N' then 1 else 0 end PYMT_N_CNT,
 
 			TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD') MRGN_PYMT_DATE	,
 			A.SHIP_PROC_TYPE	,
-			DECODE(A.SHIP_PROC_TYPE, '01', 1, 0) SHIP_PROC_TYPE_A,
-			DECODE(A.SHIP_PROC_TYPE, '02', 1, 0) SHIP_PROC_TYPE_B,
-			DECODE(A.SHIP_PROC_TYPE, '03', 1, 0) SHIP_PROC_TYPE_C,
-			DECODE(A.SHIP_PROC_TYPE, '04', 1, 0) SHIP_PROC_TYPE_D,
-			DECODE(A.SHIP_PROC_TYPE, '05', 1, 0) SHIP_PROC_TYPE_E,
+			case A.SHIP_PROC_TYPE when '01' then 1 else 0 end SHIP_PROC_TYPE_A,
+			case A.SHIP_PROC_TYPE when '02' then 1 else 0 end SHIP_PROC_TYPE_B,
+			case A.SHIP_PROC_TYPE when '03' then 1 else 0 end SHIP_PROC_TYPE_C,
+			case A.SHIP_PROC_TYPE when '04' then 1 else 0 end SHIP_PROC_TYPE_D,
+			case A.SHIP_PROC_TYPE when '05' then 1 else 0 end SHIP_PROC_TYPE_E,
 			
 			A.SHIP_CMSN_COST	,
 			A.DTTN_CAP_CNT	,
@@ -1000,7 +1004,7 @@
       		F.CODENM WO_DTTN_STR,
 			TO_CHAR(A.FIELD_ARST_DATE, 'YYYY-MM-DD hh24:mi') FIELD_ARST_DATE,
 			TO_CHAR(A.FIELD_RLS_DATE, 'YYYY-MM-DD hh24:mi') FIELD_RLS_DATE	,
-			DECODE(A.FIELD_ARST_DATE, NULL, 0, 1) FIELD_CNT,
+			case A.FIELD_ARST_DATE when NULL then 0 else 1 end FIELD_CNT,
 			A.LEAD_DISTANCE	,
 			A.LEAD_HOUR	,
 			A.LEAD_MINUTE	,
@@ -1013,12 +1017,14 @@
 			A.REG_USER	,
 			A.REG_AGENCY	 
 		  FROM T_CHN_ARREST_INFO A,
+			right outer join
+			(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G on G.CODE2 = A.AGENCY_GUARD,
            TCODE B ,  -- 위반내용
            (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C,  -- 시군구
            TCODE D ,  -- 선적
            TCODE E ,  -- 선종
            (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F, -- 무혐의 불구속
-           (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G
+
 		 WHERE A.DEL_YN = 'N'
        AND (A.VLTN_TYPE = B.CODE2 AND B.CODE1 = 'T003')
        AND (A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE)