diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
index 5ff189c2..25e23a59 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
@@ -80,7 +80,7 @@ INSERT INTO TB_CRDN (
      , LINK_TBL_NM           <!-- 연계 테이블 명 -->
 ) VALUES (
        #{crdn.crdnId}                <!-- 단속 ID -->
-     , #{crdn.sggCd}                 <!-- 시군구 코드 -->
+     , (SELECT SGG_CD FROM TB_SGG_INFO WHERE INST_CD = #{currentUser.institute}) <!-- 시군구 코드 -->
      , #{crdn.crdnRegSeCd}           <!-- 단속 등록 구분 코드 -->
      , #{crdn.crdnInptSeCd}          <!-- 단속 입력 구분 코드 -->
      , #{crdn.linkId}                <!-- 연계 ID -->
@@ -94,10 +94,13 @@ INSERT INTO TB_CRDN (
      , #{crdn.crdnPlc}               <!-- 단속 장소 -->
      , #{crdn.dtlCrdnPlc}            <!-- 상세 단속 장소 -->
      , #{crdn.teamId}                <!-- 조 ID -->
-     , (SELECT VLTN_ID FROM TB_VLTN_INFO
-        WHERE SGG_CD = '41480' <!-- TODO : 시군구코드 하드코딩 제거 -->
-        AND TASK_SE_CD = #{crdn.taskSeCd}
-        AND VLTN_CD = #{crdn.vltnCd})                <!-- 위반 ID -->
+     , (SELECT B.VLTN_ID 
+          FROM TB_SGG_INFO A
+          INNER JOIN TB_VLTN_INFO B
+         WHERE A.SGG_CD = B.SGG_CD 	
+           AND A.INST_CD = #{currentUser.institute}	
+           AND B.TASK_SE_CD = #{crdn.taskSeCd}
+           AND B.VLTN_CD = #{crdn.vltnCd})                <!-- 위반 ID -->
      , #{crdn.crdnSpareaCd}          <!-- 단속 특별구역 코드 -->
      , #{crdn.crdnBgngTm}            <!-- 단속 시작 시각 -->
      , #{crdn.crdnEndHr}             <!-- 단속 종료 시간 -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index b3bc076c..c7d14441 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -13,7 +13,7 @@
 						위반일자
 					</label>
 					<input type="text" id="crdnYmd--${pageName}" name="crdnYmd" data-map="CRDN_YMD"
-						class="form-control form-date" data-fmt-type="day" required />
+						class="form-control form-date" data-fmt-type="day" maxlength="10" required />
 		            <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 				</div>
 				<div class="col-md-4">
@@ -155,7 +155,7 @@
 		<form id="frmFile--${pageName}" class="dpv eca" method="post" enctype="multipart/form-data">
 			<input type="file" id="uploadFileList--${pageName}" name="uploadFileList" multiple accept="image/*" />
 		</form>
-		<div id="display--${pageName}">
+		<div id="display--${pageName}" style="overflow-y: scroll;max-height: 680px;">
 
 		</div>
 	</div>
@@ -246,9 +246,33 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * 초기화
 	 **************************************************************************/
-	//달력 초기화
-	initDatepicker("frmEdit--${pageName}");
+	initDatepicker("frmEdit--${pageName}"); //달력 초기화
 
+	$("#frmEdit--${pageName}").find(".form-date").each(function(){
+		$(this).on("input",function(){
+			var value = this.value.replaceAll("-","");
+			
+			if(value.length > 7){
+				this.value = value.substring(0,4)+"-"+value.substring(4,6)+"-"+value.substring(6);
+			} else if(value.length > 5){
+				this.value = value.substring(0,4)+"-"+value.substring(4);
+			}
+			
+		});
+	});
+	$("#frmEdit--${pageName}").find(".form-time").each(function(){
+		$(this).on("input",function(){
+			var value = this.value.replaceAll(":","");
+			
+			if(value.length > 5){
+				this.value = value.substring(0,2)+":"+value.substring(2,4)+":"+value.substring(4);
+			} else if(value.length > 3){
+				this.value = value.substring(0,2)+":"+value.substring(2);
+			}
+			
+		});
+	});
+	
 	//보안모드
     fn_securityModeToggle($("#securityMode--top").is(":checked"));