diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java
index 617077b..750d3f7 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java
+++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java
@@ -39,11 +39,10 @@ public interface ApiStatusRepository extends BaseRepository<ApiStatus, String> {
 	  + "   FROM ("
 	  + "     SELECT A.EAISVCNAME"
 	  + "          , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE"
-	  //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것
-	  + "          , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X "
-	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)"
-	  //+ "                     AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) "
-	  + "                     AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN "
+	  + "          , NVL(( SELECT MAX('Y') FROM EMSAPP.DJB_APISTATUS_INCIDENT_API X"
+	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.DJB_APISTATUS_INCIDENT Y WHERE X.INCIDENT_ID = Y.INCIDENT_ID "
+	  + "        	                       AND SYSTIMESTAMP BETWEEN STARTED_AT AND END_AT) "
+	  + "                     AND A.EAISVCNAME = X.API_ID),'N') AS CTRL_YN "
 	  + "          , (SELECT CASE WHEN TOTAL = 0 THEN 'X'"
 	  + "                         WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'"
 	  + "                    ELSE 'N' END"