diff --git a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
index 73f581c..2c98a4c 100644
--- a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
+++ b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
@@ -199,7 +199,7 @@
 					THEN 0
 					ELSE (IF(A.SUBS_STTUS_CD IN ('03','04') AND A.USE_DAY IS NULL,0,(ROUND((A.FX_LMT_AMT/LAST_DT)*IFNULL(A.USE_DAY,LAST_DT))))
 						+ A.CFWD_AMT - A.EXTNC_AMT - A.TOTAL_USE_AMT 
-						+ (A.EXTC_CHRG_AMT - (A.EXTC_CHRG_RSRT+A.EXTC_CHRG_BLNC)) + (A.CFWD_CHRG_RSRT + A.CFWD_CHRG_BLNC))
+						+ (A.EXTC_CHRG_AMT - (A.EXTC_CHRG_BLNC)) + (A.CFWD_CHRG_BLNC))
 				END) AS EST_CFWD_AMT
 				,IF(A.SUBS_STTUS_CD IN ('03','04') AND A.USE_DAY IS NULL,0,(ROUND((A.FX_LMT_AMT/LAST_DT)*IFNULL(A.USE_DAY,LAST_DT)))) AS LMT_PER_USE_DAY
 				,A.TOTAL_USE_AMT
@@ -469,7 +469,7 @@
 							ESI.CUST_SEQ
 							,ESI.USER_SEQ
 							,ESI.SUBS_ID
-							,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') = DATE_FORMAT(CONCAT(STR_TO_DATE('202306','%Y%m'),'01'),'%Y%m') AND ESH.SUBS_STTUS_CD IN ('03','04'),-1,0) AS P_DAY
+							,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') = DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m') AND ESH.SUBS_STTUS_CD IN ('03','04'),-1,0) AS P_DAY
 							,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') != DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),'01',DATE_FORMAT(ESH.EFCT_ST_DT,'%d')) AS EFCT_ST_DT
 							,IF(ESH.EFCT_FNS_DT <![CDATA[ > ]]> LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')) ,DATE_FORMAT(LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')),'%d'),DATE_FORMAT(ESH.EFCT_FNS_DT,'%d')) AS EFCT_FNS_DT
 							,(CASE