diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java
index 96f76574..a3d3524e 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java
@@ -16,108 +16,112 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 public class ProcessResultBaseEntity extends BaseModel {
 
-    @Column(name = "process_status")
-    private String processStatus;
+  @Column(name = "process_status")
+  private String processStatus;
 
-    @Column(name = "pressurized_time_taken")
-    private String pressurizedTimeTaken;
+  @Column(name = "pressurized_time_taken")
+  private String pressurizedTimeTaken;
 
-    @Column(name = "warrant_req_take_time")
-    private String warrantReqTakeTime;
+  @Column(name = "warrant_req_take_time")
+  private String warrantReqTakeTime;
 
-    @Column(name = "is_ivsgt_stop")
-    private String isIvsgtStop;
+  @Column(name = "is_ivsgt_stop")
+  private String isIvsgtStop;
 
-    @Column(name = "eviction_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate evictionDt;
+  @Column(name = "eviction_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate evictionDt;
 
-    @Column(name = "direct_handover_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate directHandoverDt;
+  @Column(name = "direct_handover_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate directHandoverDt;
 
-    @Column(name = "handover_sea_point_lon")
-    private String handoverSeaPointLon;
+  @Column(name = "handover_sea_point_lon")
+  private String handoverSeaPointLon;
 
-    @Column(name = "handover_sea_point_lat")
-    private String handoverSeaPointLat;
+  @Column(name = "handover_sea_point_lat")
+  private String handoverSeaPointLat;
 
-    @Column(name = "handover_sea_point_detail")
-    private String handoverSeaPointDetail;
+  @Column(name = "handover_sea_point_detail")
+  private String handoverSeaPointDetail;
 
-    @Column(name = "handover_boat")
-    private String handoverBoat;
+  @Column(name = "handover_boat")
+  private String handoverBoat;
 
-    @Column(name = "middle_takeover_boat")
-    private String middleTakeoverBoat;
+  @Column(name = "middle_takeover_boat")
+  private String middleTakeoverBoat;
 
-    @Column(name = "consignment_start_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate consignmentStartDt;
+  @Column(name = "consignment_start_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate consignmentStartDt;
 
-    @Column(name = "consignment_end_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate consignmentEndDt;
+  @Column(name = "consignment_end_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate consignmentEndDt;
 
-    @Column(name = "confiscation_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate confiscationDt;
+  @Column(name = "confiscation_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate confiscationDt;
 
-    @Column(name = "boat_disposal_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate boatDisposalDt;
+  @Column(name = "boat_disposal_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate boatDisposalDt;
 
-    @Column(name = "boat_disposal_type")
-    private String boatDisposalType;
+  @Column(name = "boat_disposal_type")
+  private String boatDisposalType;
 
-    @Column(name = "return_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate returnDt;
+  @Column(name = "return_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate returnDt;
 
-    @Column(name = "exile_cnt")
-    private Integer exileCnt;
+  @Column(name = "exile_cnt")
+  private Integer exileCnt;
 
-    @Column(name = "exile_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDate exileDt;
+  @Column(name = "exile_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate exileDt;
 
-    @Column(name = "flight")
-    private String flight;
+  @Column(name = "flight")
+  private String flight;
 
-    @Column(name = "immigration_office_name")
-    private String immigrationOfficeName;
+  @Column(name = "immigration_office_name")
+  private String immigrationOfficeName;
 
-    @Column(name = "immigration_office_officer_name")
-    private String immigrationOfficeOfficerName;
+  @Column(name = "immigration_office_officer_name")
+  private String immigrationOfficeOfficerName;
 
-    @Column(name = "immigration_office_officer_contact")
-    private String immigrationOfficeOfficerContact;
+  @Column(name = "immigration_office_officer_contact")
+  private String immigrationOfficeOfficerContact;
 
-    @Column(name = "sentencing_court")
-    private String sentencingCourt;
+  @Column(name = "sentencing_court")
+  private String sentencingCourt;
 
-    @Column(name = "sentencing_detail")
-    private String sentencingDetail;
+  @Column(name = "sentencing_detail")
+  private String sentencingDetail;
 
-    @Column(name = "execution_detail")
-    private String executionDetail;
+  @Column(name = "execution_detail")
+  private String executionDetail;
 
-    @Column(name = "wrt_organ")
-    private String wrtOrgan;
+  @Column(name = "wrt_organ")
+  private String wrtOrgan;
 
-    @Column(name = "wrt_part")
-    private String wrtPart;
+  @Column(name = "wrt_part")
+  private String wrtPart;
 
-    @Column(name = "wrt_user_seq")
-    private Integer wrtUserSeq;
+  @Column(name = "wrt_user_seq")
+  private Integer wrtUserSeq;
 
-    @Column(name = "wrt_user_grd")
-    private String wrtUserGrd;
+  @Column(name = "wrt_user_grd")
+  private String wrtUserGrd;
 
-    @Column(name = "wrt_user_nm")
-    private String wrtUserNm;
+  @Column(name = "wrt_user_nm")
+  private String wrtUserNm;
 
-    @Column(name = "wrt_dt")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime wrtDt;
+  @Column(name = "wrt_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime wrtDt;
+
+  @Column(name = "release_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime releaseDt;
 }
diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index f850877f..d5d6a89a 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -84,6 +84,9 @@
 .w-35{
   width:35%!important;
 }
+.w-40{
+  width: 40%!important;
+}
 .w-70{
   width:70%!important;
 }
diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
index 01df7109..560d50c7 100644
--- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
+++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js
@@ -87,6 +87,35 @@ $(document).on('change', '#violationSelector', function (){
       )
     }
   }
+  switch (this.selectedOptions[0].value) {
+    case "VT011": // 어획량 축소 기재
+      childInputStateChange(2, $("#catchDiv").find("input"))
+      break;
+    case "VT028": // 특수공무집행방해
+      childInputStateChange(2, $("#damageDiv").find("input, textarea"))
+      break;
+  }
+
+})
+$(document).on('click', '.violationRemoveBtn', function (){
+  const parentDiv = $(this).parents(".violation")
+  switch (parentDiv.find(".violationCd").val()){
+    case "VT011": // 어획량 축소 기재
+      childInputStateChange(1, $("#catchDiv").find("input"))
+      break;
+    case "VT028": // 특수공무집행방해
+      childInputStateChange(1, $("#damageDiv").find("input, textarea"))
+      break;
+  }
+  parentDiv.remove();
+})
+
+$(document).on('change', '.timeInputer', function (){
+  var timeFormat = /^([01][0-9]|2[0-3]):([0-5][0-9])$/; // 시간형식 체크 정규화 hh:mm
+  if(!timeFormat.test(this.value)){
+    alert("시간 입력 형식에 맞지 않습니다.(00:00~23:59)")
+    this.value = '';
+  }
 })
 $(document).on('click', '.versionInfoTr', function (){
   $(".versionInfoChkbox").prop("checked", false);
@@ -107,9 +136,6 @@ $(document).on('click', '.versionInfoTr', function (){
     }
   });
 })
-$(document).on('click', '.violationRemoveBtn', function (){
-  $(this).parents(".violation").remove();
-})
 $(document).on('change', '.boatNameKr', function (){
   $(".boatNameKr").val(this.value);
 })
@@ -119,6 +145,11 @@ $(document).on('change', '.oxSelector', function (){
 $(document).on('change', '#directHandoverSelector', function (){
   childInputStateChange(Number(this.value), $("#directHandoverDiv").find("input"))
 })
+$(document).on('change', '#offenseSelector', function (){
+  childInputStateChange(Number(this.value), $("#offenseIllegalWasteQuantity"))
+  childInputStateChange(Number(this.value), $("#offenseQuantity"))
+  childInputStateChange(Number(this.value), $("#offenseAmount"))
+})
 
 $(document).on('change', '#equalCaptain', function (){
   if(this.checked){
@@ -163,6 +194,11 @@ $(document).on('click', '.saveEditInfoBtn', function (){
 })
 $(document).on('change', '#napoDate, #napoTime', function (){
   $("#napoDt").val($("#napoDate").val()+" "+$("#napoTime").val());
+  calculationReleaseToNapo()
+})
+$(document).on('change', '#releaseDate, #releaseTime', function (){
+  $("#releaseDt").val($("#releaseDate").val()+" "+$("#releaseTime").val());
+  calculationReleaseToNapo()
 })
 $(document).on('change', '#paymentPaymentDate, #paymentPaymentTime', function (){
   $("#paymentPaymentDt").val($("#paymentPaymentDate").val()+" "+$("#paymentPaymentTime").val());
@@ -206,36 +242,26 @@ function getFishingBoatEditModal(cdsKey){
       if(crackdownPolice){
         getCrackdownBoatOption(crackdownPolice)
       }
-      if(cdsKey !== null){
-        if($("#crackdownStatus").val()!=="DST001"){
-          $(".crackdownStatusInfo").attr("disabled", "disabled")
-        }
-        if($("#processResultStatus").val()!=="DST001"){
-          $(".processResultInfo").attr("disabled", "disabled")
-        }
-
-        $(".sailorInfo").attr("disabled", "disabled")
-        if($("#captainStatus").val()==="DST001"){
-          $("#captainDiv").find("input").removeAttr("disabled")
-          $("#captainRestriction").removeAttr("disabled")
-        }
-        if($("#shipOwnerStatus").val()==="DST001"){
-          $("#shipOwnerDiv").find("input").removeAttr("disabled")
-        }
-        if($("#navigatingOfficerStatus").val()==="DST001"){
-          $("#navigatingOfficerRestriction").removeAttr("disabled")
-        }
-        if($("#chiefEngineerStatus").val()==="DST001"){
-          $("#chiefEngineerRestriction").removeAttr("disabled")
-        }
-        $.each($(".sailorRestriction"), function (idx, div){
-          if($(div).find(".sailorStatus").val()==="DST001"){
-            $(div).find("input,select").removeAttr("disabled");
-          }
-        })
-      }else{
-        setUploadDiv();
+      $(".sailorInfo").attr("disabled", "disabled")
+      if($("#captainStatus").val()==="DST001"){
+        $("#captainDiv").find("input").removeAttr("disabled")
+        $("#captainRestriction").removeAttr("disabled")
       }
+      if($("#shipOwnerStatus").val()==="DST001"){
+        $("#shipOwnerDiv").find("input").removeAttr("disabled")
+      }
+      if($("#navigatingOfficerStatus").val()==="DST001"){
+        $("#navigatingOfficerRestriction").removeAttr("disabled")
+      }
+      if($("#chiefEngineerStatus").val()==="DST001"){
+        $("#chiefEngineerRestriction").removeAttr("disabled")
+      }
+      $.each($(".sailorRestriction"), function (idx, div){
+        if($(div).find(".sailorStatus").val()==="DST001"){
+          $(div).find("input,select").removeAttr("disabled");
+        }
+      })
+      setUploadDiv();
       $("#fishingBoatEditModal").modal('show');
     },
     error:function(e){
@@ -377,4 +403,14 @@ function saveFishingBoatInfo(status){
       }
     })
   }
-}
\ No newline at end of file
+}
+
+function calculationReleaseToNapo(){
+  let napoDt = $("#napoDt").val();
+  let releaseDt = $("#releaseDt").val();
+  if(napoDt.length>15&&releaseDt.length>15){
+    releaseDt = new Date(releaseDt);
+    napoDt = new Date(napoDt);
+    $("#releaseToNapo").val(Math.ceil((releaseDt.getTime()-napoDt.getTime())/(1000*60*60*24))+"일");
+  }
+}
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html
index 721d220b..d2f0ade5 100644
--- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html
+++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html
@@ -36,7 +36,7 @@
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="caseAgency">
-                          <option value="">사건담당기관</option>
+                          <option value="">사건담당경찰서</option>
                           <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                                     th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option>
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html
index ebd4cda7..a696fdb7 100644
--- a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html
+++ b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html
@@ -50,7 +50,7 @@
       <label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</label>
     </div>
     <div class="row mb-1">
-      <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label>
+      <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당경찰서</label>
       <div class="col-sm-2">
         <select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
           <option value=""></option>
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
index efa80a1e..5db6f7ad 100644
--- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
+++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
@@ -45,7 +45,7 @@
                 </div>
                 <hr class="my-1">
                 <div class="row mb-1">
-                    <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당기관</label>
+                    <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰서</label>
                     <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                     <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
                     </th:block>
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
index ef844273..03083bd9 100644
--- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
+++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
@@ -78,7 +78,7 @@
                       </div>
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="caseAgency">
-                          <option value="">사건담당기관</option>
+                          <option value="">사건담당경찰서</option>
                           <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                                     th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option>
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
index f3c098e8..d8b92bd8 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
@@ -21,16 +21,16 @@
     <input type="hidden" name="fishingBoat.wrtUserGrd" th:value="${crackdownStatus.fishingBoat.wrtUserGrd}">
     <ul class="nav nav-tabs" id="userTab" role="tablist">
       <li class="nav-item" role="presentation">
-        <button class="nav-link active" id="baseInfoTab" data-bs-toggle="tab" data-bs-target="#baseInfoTabPanel" type="button" role="tab" aria-controls="baseInfoTabPanel" aria-selected="true">기본정보</button>
+        <button class="nav-link active" id="baseInfoTab" data-bs-toggle="tab" data-bs-target="#baseInfoTabPanel" type="button" role="tab" aria-controls="baseInfoTabPanel" aria-selected="true">단속정보</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" id="sailorTab" data-bs-toggle="tab" data-bs-target="#sailorTabPanel" type="button" role="tab" aria-controls="sailorTabPanel" aria-selected="false">선장/선주정보</button>
+        <button class="nav-link" id="sailorTab" data-bs-toggle="tab" data-bs-target="#sailorTabPanel" type="button" role="tab" aria-controls="sailorTabPanel" aria-selected="false">선장/선주 정보</button>
       </li>
       <li class="nav-item" role="presentation">
         <button class="nav-link" id="fishingBoatTab" data-bs-toggle="tab" data-bs-target="#fishingBoatTabPanel" type="button" role="tab" aria-controls="fishingBoatTabPanel" aria-selected="false">어선정보</button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="nav-link" id="processResultTab" data-bs-toggle="tab" data-bs-target="#processResultTabPanel" type="button" role="tab" aria-controls="processResultTabPanel" aria-selected="false">처리결과</button>
+        <button class="nav-link" id="processResultTab" data-bs-toggle="tab" data-bs-target="#processResultTabPanel" type="button" role="tab" aria-controls="processResultTabPanel" aria-selected="false">처리결과 정보</button>
       </li>
     </ul>
     <div class="tab-content bg-white border border-top-0">
@@ -38,20 +38,47 @@
         <div class="row mb-1">
           <label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
+            <input type="text" class="form-control form-control-sm  boatNameKr" id="boatNameKr" name="fishingBoat.boatNameKr" placeholder="한글" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
           </div>
           <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
           <div class="col-sm-2">
-            <div class="input-group">
-              <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${crackdownStatus.caseNum}">
-              <input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
+            <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${crackdownStatus.caseNum}">
+            <!--<div class="input-group">
+              <input type="text" class="form-control form-control-sm " id="caseNum" name="caseNum" th:value="${crackdownStatus.caseNum}">
+              <input type="button" class="btn btn-sm btn-outline-primary  w-auto" id="caseNumBtn" value="불러오기">
+            </div>-->
+          </div>
+          <label for="violationSelector" class="col-sm-1 col-form-label col-form-label-sm text-center">위반사항</label>
+          <div class="col-sm-1">
+            <select class="form-select form-select-sm" id="violationSelector">
+              <option value="">선택</option>
+              <th:block th:each="code:${vtList}">
+                <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+              </th:block>
+            </select>
+          </div>
+          <div class="col-sm-4">
+            <div class="row" id="violationDiv">
+              <th:block th:each="violation:${crackdownStatus.violationList}">
+                <div class="col-6 violation">
+                  <input type="hidden" class="form-control form-control-sm  violationCd" th:value="${violation.violation}">
+                  <div class="input-group w-auto">
+                    <th:block th:each="code:${vtList}">
+                      <input type="text" class="form-control form-control-sm" th:if="${code.itemCd eq violation.violation}" th:value="${code.itemValue}">
+                    </th:block>
+                    <button type="button" class="btn btn-sm btn-outline-secondary opacity-75 violationRemoveBtn">
+                      <i class="bi bi-dash-square text-danger"></i>
+                    </button>
+                  </div>
+                </div>
+              </th:block>
             </div>
           </div>
         </div>
         <div class="row mb-1">
           <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당경찰서</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo" id="caseAgency" name="caseAgency">
+            <select class="form-select form-select-sm " id="caseAgency" name="caseAgency">
               <option value="">선택</option>
               <th:block th:each="code:${session.commonCode.get('OG')}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.caseAgency}"></option>
@@ -60,11 +87,11 @@
           </div>
           <label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${crackdownStatus.casePoliceOfficer}">
+            <input type="text" class="form-control form-control-sm " id="casePoliceOfficer" name="casePoliceOfficer" th:value="${crackdownStatus.casePoliceOfficer}">
           </div>
           <label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo crackdownPolice" name="crackdownPolice" id="crackdownPolice">
+            <select class="form-select form-select-sm  crackdownPolice" name="crackdownPolice" id="crackdownPolice">
               <option value="">선택</option>
               <th:block th:each="code:${cpoList}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.crackdownPolice}"></option>
@@ -73,7 +100,7 @@
           </div>
           <label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${crackdownStatus.crackdownBoat}">
+            <select class="form-select form-select-sm  crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${crackdownStatus.crackdownBoat}">
               <option value="">단속경찰서를 선택해주세요.</option>
               <th:block th:each="code:${session.commonCode.get(crackdownStatus.crackdownPolice)}">
                 <th:block th:if="${code.useChk eq 'T'}">
@@ -83,30 +110,126 @@
             </select>
           </div>
         </div>
+        <div class="row mb-1">
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">MMSI.NO</label>
+          <div class="col-sm-2">
+            <input class="form-control form-control-sm" name="mmsi" th:value="${crackdownStatus.mmsi}">
+          </div>
+          <label for="invasionType" class="col-sm-1 col-form-label col-form-label-sm text-center">침범유형</label>
+          <div class="col-sm-2">
+            <select class="form-select form-select-sm" name="invasionType" id="invasionType">
+              <option value="">선택</option>
+              <th:block th:each="commonCode:${session.commonCode.get('IST')}">
+                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                        th:selected="${commonCode.itemCd eq crackdownStatus.invasionType}"></option>
+              </th:block>
+            </select>
+          </div>
+          <label for="nll" class="col-sm-1 col-form-label col-form-label-sm text-center">NLL</label>
+          <div class="col-sm-2">
+            <select class="form-select form-select-sm" name="nll" id="nll">
+              <option value="Y" th:selected="${crackdownStatus.nll == 'Y'}">O</option>
+              <option value="N" th:selected="${crackdownStatus.nll == 'N'}">X</option>
+            </select>
+          </div>
+          <label for="fieldIvsgt" class="col-sm-1 col-form-label col-form-label-sm text-center">압송/현장조사</label>
+          <div class="col-sm-2">
+            <select class="form-select form-select-sm " name="fieldIvsgt" id="fieldIvsgt">
+              <option value="">선택</option>
+              <option value="C" th:selected="${crackdownStatus.fieldIvsgt eq 'C'}">압송</option>
+              <option value="F" th:selected="${crackdownStatus.fieldIvsgt eq 'F'}">현장조사</option>
+            </select>
+          </div>
+        </div>
         <div class="row mb-1">
           <label for="napoDate" class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
           <div class="col-sm-2">
-            <input type="hidden" id="napoDt" name="napoDt" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd hh:mm')}">
             <div class="input-group">
-              <input type="text" class="form-control form-control-sm crackdownStatusInfo dateSelector" id="napoDate" placeholder="0000-00-00" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
-              <input type="text" class="form-control form-control-sm crackdownStatusInfo" id="napoTime" placeholder="00:00" th:value="${#temporals.format(crackdownStatus.napoDt, 'hh:mm')}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm  dateSelector" id="napoDate" placeholder="yyyy-mm-dd" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd')}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm timeInputer" id="napoTime" placeholder="hh:mm" th:value="${#temporals.format(crackdownStatus.napoDt, 'hh:mm')}" autocomplete="off">
             </div>
           </div>
           <label for="napoSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">나포장소</label>
           <div class="col-sm-5">
             <div class="input-group w-auto">
-              <input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLon" name="napoSeaPointLon" placeholder="00 . 00 . 00N" th:value="${crackdownStatus.napoSeaPointLon}">
-              <input type="text" class="form-control form-control-sm w-25 crackdownStatusInfo" id="napoSeaPointLat" name="napoSeaPointLat" placeholder="000-00.00E" th:value="${crackdownStatus.napoSeaPointLat}">
-              <input type="text" class="form-control form-control-sm w-50 crackdownStatusInfo" id="napoSeaPointDetail" name="napoSeaPointDetail" placeholder="00도 00방 00해리, 어업협정선 내측 00해리" th:value="${crackdownStatus.napoSeaPointDetail}">
+              <input type="text" class="form-control form-control-sm w-25 " id="napoSeaPointLon" name="napoSeaPointLon" placeholder="00 . 00 . 00N" th:value="${crackdownStatus.napoSeaPointLon}">
+              <input type="text" class="form-control form-control-sm w-25 " id="napoSeaPointLat" name="napoSeaPointLat" placeholder="000-00.00E" th:value="${crackdownStatus.napoSeaPointLat}">
+              <input type="text" class="form-control form-control-sm w-50 " id="napoSeaPointDetail" name="napoSeaPointDetail" placeholder="00도 00방 00해리, 어업협정선 내측 00해리" th:value="${crackdownStatus.napoSeaPointDetail}">
             </div>
           </div>
-          <label for="fieldIvsgt" class="col-sm-1 col-form-label col-form-label-sm text-center">압송/현장조사</label>
-          <div class="col-sm-2">
-            <select class="form-select form-select-sm crackdownStatusInfo" name="fieldIvsgt" id="fieldIvsgt">
-              <option value="">선택</option>
-              <option value="C" th:selected="${crackdownStatus.fieldIvsgt eq 'C'}">압송</option>
-              <option value="F" th:selected="${crackdownStatus.fieldIvsgt eq 'F'}">현장조사</option>
-            </select>
+        </div>
+        <hr class="my-1">
+        <div class="row mb-1">
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">특수공무집행방해</label>
+          <div class="col-sm-11 border" id="damageDiv"
+               th:with="damageFlag=${crackdownStatus.obstrExspdCnt ne null ||
+                                     crackdownStatus.personDamageCnt ne null ||
+                                     crackdownStatus.personDamageAmount ne null ||
+                                     crackdownStatus.personDamageDetail ne null ||
+                                     crackdownStatus.materialDamageCnt ne null ||
+                                     crackdownStatus.materialDamageAmount ne null ||
+                                     crackdownStatus.materialDamageDetail ne null}">
+            <div class="row my-1">
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">인적피해</label>
+              <div class="col-sm-11 border">
+                <div class="row my-1">
+                  <label class="col-sm-1 mb-1 col-form-label col-form-label-sm text-center">발생건수</label>
+                  <div class="col-sm-2">
+                    <input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" th:value="${crackdownStatus.obstrExspdCnt}" th:disabled="${!damageFlag}">
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해인원</label>
+                  <div class="col-sm-2">
+                    <input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" th:value="${crackdownStatus.personDamageCnt}" th:disabled="${!damageFlag}">
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
+                  <div class="col-sm-2">
+                    <input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" th:value="${crackdownStatus.personDamageAmount}" th:disabled="${!damageFlag}">
+                  </div>
+                  <div class="col-sm-3"></div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
+                  <div class="col-sm-11">
+                    <textarea class="form-control form-control-sm" name="personDamageDetail" rows="3" th:value="${crackdownStatus.personDamageDetail}" th:disabled="${!damageFlag}"></textarea>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="row mb-1">
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">물적피해</label>
+              <div class="col-sm-11 border">
+                <div class="row my-1">
+                  <label class="col-sm-1 mb-1 col-form-label col-form-label-sm text-center">발생건수</label>
+                  <div class="col-sm-2">
+                    <input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" th:value="${crackdownStatus.materialDamageCnt}" th:disabled="${!damageFlag}">
+                  </div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">피해액</label>
+                  <div class="col-sm-2">
+                    <input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" th:value="${crackdownStatus.materialDamageAmount}" th:disabled="${!damageFlag}">
+                  </div>
+                  <div class="col-sm-6"></div>
+                  <label class="col-sm-1 col-form-label col-form-label-sm text-center">상세내용</label>
+                  <div class="col-sm-11">
+                    <textarea class="form-control form-control-sm" name="materialDamageDetail" rows="3" th:value="${crackdownStatus.materialDamageDetail}" th:disabled="${!damageFlag}"></textarea>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="row mb-1">
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">어획물 축소기재</label>
+          <div class="col-sm-11 border" id="catchDiv"
+               th:with="catchFlag=${crackdownStatus.obstrExspdCnt ne null ||
+                                     crackdownStatus.personDamageCnt ne null}">
+            <div class="row">
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">어종</label>
+              <div class="col-sm-2">
+                <input type="text" class="form-control form-control-sm" name="fishingBoat.catchFishSpecies" th:value="${crackdownStatus.fishingBoat.catchFishSpecies}" th:disabled="${!catchFlag}">
+              </div>
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">수량</label>
+              <div class="col-sm-2">
+                <input type="number" class="form-control form-control-sm" name="fishingBoat.catchCnt" th:value="${crackdownStatus.fishingBoat.catchCnt}" th:disabled="${!catchFlag}">
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -121,36 +244,41 @@
                 <label for="sailorNameKr" class="col-sm-2 col-form-label col-form-label-sm text-center">선장명</label>
                 <div class="col-sm-10">
                   <div class="input-group w-auto">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameKr" placeholder="한글">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameCn" placeholder="중문">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNamePinyin" placeholder="병음">
+                    <input type="text" class="form-control form-control-sm " id="sailorNameKr" placeholder="한글">
+                    <input type="text" class="form-control form-control-sm " id="sailorNameCn" placeholder="중문">
+                    <input type="text" class="form-control form-control-sm " id="sailorNamePinyin" placeholder="병음">
                   </div>
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="birthdate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00" autocomplete="off">
+                  <input type="text" class="form-control form-control-sm  dateSelector" id="birthdate" placeholder="yyyy-mm-dd" autocomplete="off">
                 </div>
                 <label for="sailorContact" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="sailorContact">
+                  <input type="text" class="form-control form-control-sm " id="sailorContact">
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="residence" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="residence" placeholder="성 기준">
+                  <select class="form-select form-select-sm" id="residence">
+                    <option value="">선택</option>
+                    <th:block th:each="code:${session.commonCode.get('RSC')}">
+                      <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+                    </th:block>
+                  </select>
                 </div>
                 <label for="arrestHistory" class="col-sm-2 col-form-label col-form-label-sm text-center">재범횟수</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="arrestHistory">
+                  <input type="text" class="form-control form-control-sm " id="arrestHistory">
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="note" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
                 <div class="col-sm-10">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="note">
+                  <input type="text" class="form-control form-control-sm " id="note">
                 </div>
               </div>
               <div class="row mb-3">
@@ -171,13 +299,13 @@
                     -->
                   </div>
                 </div>
-                <input type="file" class="d-none sailorInfo" id="fileInputer" multiple>
+                <input type="file" class="d-none " id="fileInputer" multiple>
               </div>
             </div>
             <div class="col-6 border-start" id="shipOwnerDiv">
               <div class="row mb-1">
                 <div class="col-sm-4 ms-3 input-group w-auto">
-                  <input type="checkbox" class="sailorInfo" id="equalCaptain">
+                  <input type="checkbox" class="" id="equalCaptain">
                   <label for="equalCaptain" class="col-form-label col-form-label-sm ps-2">좌측동일</label>
                 </div>
               </div>
@@ -185,32 +313,37 @@
                 <label for="sailorNameKr2" class="col-sm-2 col-form-label col-form-label-sm text-center">선주명</label>
                 <div class="col-sm-10">
                   <div class="input-group w-auto">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameKr2" placeholder="한글">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameCn2" placeholder="중문">
-                    <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNamePinyin2" placeholder="병음">
+                    <input type="text" class="form-control form-control-sm " id="sailorNameKr2" placeholder="한글">
+                    <input type="text" class="form-control form-control-sm " id="sailorNameCn2" placeholder="중문">
+                    <input type="text" class="form-control form-control-sm " id="sailorNamePinyin2" placeholder="병음">
                   </div>
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="birthdate2" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00" autocomplete="off">
+                  <input type="text" class="form-control form-control-sm  dateSelector" id="birthdate2" placeholder="yyyy-mm-dd" autocomplete="off">
                 </div>
                 <label for="sailorContact2" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="sailorContact2">
+                  <input type="text" class="form-control form-control-sm " id="sailorContact2">
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="residence2" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
                 <div class="col-sm-4">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="residence2" placeholder="성 기준">
+                  <select class="form-select form-select-sm" id="residence2">
+                    <option value="">선택</option>
+                    <th:block th:each="code:${session.commonCode.get('RSC')}">
+                      <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+                    </th:block>
+                  </select>
                 </div>
               </div>
               <div class="row mb-1">
                 <label for="note2" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
                 <div class="col-sm-10">
-                  <input type="text" class="form-control form-control-sm sailorInfo" id="note2">
+                  <input type="text" class="form-control form-control-sm " id="note2">
                 </div>
               </div>
             </div>
@@ -228,36 +361,41 @@
                     <label for="sailorNameKr" class="col-sm-2 col-form-label col-form-label-sm text-center">선장명</label>
                     <div class="col-sm-10">
                       <div class="input-group w-auto">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameKr" placeholder="한글" th:value="${sailor.sailorNameKr}">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameCn" placeholder="중문" th:value="${sailor.sailorNameCn}">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNamePinyin" placeholder="병음" th:value="${sailor.sailorNamePinyin}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNameKr" placeholder="한글" th:value="${sailor.sailorNameKr}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNameCn" placeholder="중문" th:value="${sailor.sailorNameCn}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNamePinyin" placeholder="병음" th:value="${sailor.sailorNamePinyin}">
                       </div>
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="birthdate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate" placeholder="0000-00-00" th:value="${sailor.birthdate}" autocomplete="off">
+                      <input type="text" class="form-control form-control-sm  dateSelector" id="birthdate" placeholder="yyyy-mm-dd" th:value="${sailor.birthdate}" autocomplete="off">
                     </div>
                     <label for="sailorContact" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="sailorContact" th:value="${sailor.sailorContact}">
+                      <input type="text" class="form-control form-control-sm " id="sailorContact" th:value="${sailor.sailorContact}">
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="residence" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="residence" placeholder="성 기준" th:value="${sailor.residence}">
+                      <select class="form-select form-select-sm" id="residence">
+                        <option value="">선택</option>
+                        <th:block th:each="code:${session.commonCode.get('RSC')}">
+                          <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${sailor.residence eq code.itemCd}"></option>
+                        </th:block>
+                      </select>
                     </div>
                     <label for="arrestHistory" class="col-sm-2 col-form-label col-form-label-sm text-center">재범횟수</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="arrestHistory" th:value="${sailor.arrestHistory}">
+                      <input type="text" class="form-control form-control-sm " id="arrestHistory" th:value="${sailor.arrestHistory}">
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="note" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
                     <div class="col-sm-10">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="note" th:value="${sailor.note}">
+                      <input type="text" class="form-control form-control-sm " id="note" th:value="${sailor.note}">
                     </div>
                   </div>
                   <div class="row mb-3">
@@ -275,7 +413,7 @@
                         </th:block>
                       </div>
                     </div>
-                    <input type="file" class="d-none sailorInfo" id="fileInputer" multiple>
+                    <input type="file" class="d-none " id="fileInputer" multiple>
                   </div>
                 </div>
               </th:block>
@@ -285,7 +423,7 @@
                   <input type="hidden" class="status" name="status" id="shipOwnerStatus" th:value="${sailor.status}">
                   <div class="row mb-1">
                     <div class="col-sm-4 ms-3 input-group w-auto">
-                      <input type="checkbox" class="sailorInfo" id="equalCaptain">
+                      <input type="checkbox" class="" id="equalCaptain">
                       <label for="equalCaptain" class="col-form-label col-form-label-sm ps-2">좌측동일</label>
                     </div>
                   </div>
@@ -293,32 +431,37 @@
                     <label for="sailorNameKr2" class="col-sm-2 col-form-label col-form-label-sm text-center">선주명</label>
                     <div class="col-sm-10">
                       <div class="input-group w-auto">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameKr2" placeholder="한글" th:value="${sailor.sailorNameKr}">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNameCn2" placeholder="중문" th:value="${sailor.sailorNameCn}">
-                        <input type="text" class="form-control form-control-sm sailorInfo" id="sailorNamePinyin2" placeholder="병음" th:value="${sailor.sailorNamePinyin}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNameKr2" placeholder="한글" th:value="${sailor.sailorNameKr}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNameCn2" placeholder="중문" th:value="${sailor.sailorNameCn}">
+                        <input type="text" class="form-control form-control-sm " id="sailorNamePinyin2" placeholder="병음" th:value="${sailor.sailorNamePinyin}">
                       </div>
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="birthdate2" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo dateSelector" id="birthdate2" placeholder="0000-00-00" th:value="${sailor.birthdate}" autocomplete="off">
+                      <input type="text" class="form-control form-control-sm  dateSelector" id="birthdate2" placeholder="yyyy-mm-dd" th:value="${sailor.birthdate}" autocomplete="off">
                     </div>
                     <label for="sailorContact2" class="col-sm-2 col-form-label col-form-label-sm text-center">연락처</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="sailorContact2" th:value="${sailor.sailorContact}">
+                      <input type="text" class="form-control form-control-sm " id="sailorContact2" th:value="${sailor.sailorContact}">
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="residence2" class="col-sm-2 col-form-label col-form-label-sm text-center">주소</label>
                     <div class="col-sm-4">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="residence2" placeholder="성 기준" th:value="${sailor.residence}">
+                      <select class="form-select form-select-sm" id="residence2">
+                        <option value="">선택</option>
+                        <th:block th:each="code:${session.commonCode.get('RSC')}">
+                          <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${sailor.residence eq code.itemCd}"></option>
+                        </th:block>
+                      </select>
                     </div>
                   </div>
                   <div class="row mb-1">
                     <label for="note2" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
                     <div class="col-sm-10">
-                      <input type="text" class="form-control form-control-sm sailorInfo" id="note2" th:value="${sailor.note}">
+                      <input type="text" class="form-control form-control-sm " id="note2" th:value="${sailor.note}">
                     </div>
                   </div>
                 </div>
@@ -332,12 +475,12 @@
           <label for="boatNameCn" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
           <div class="col-sm-4">
             <div class="input-group w-auto">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" placeholder="한글" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="boatNameCn" name="fishingBoat.boatNameCn" placeholder="중문" th:value="${crackdownStatus.fishingBoat.boatNameCn}">
+              <input type="text" class="form-control form-control-sm  boatNameKr" placeholder="한글" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
+              <input type="text" class="form-control form-control-sm " id="boatNameCn" name="fishingBoat.boatNameCn" placeholder="중문" th:value="${crackdownStatus.fishingBoat.boatNameCn}">
             </div>
           </div>
           <div class="col-sm-1"></div>
-          <label for="violationSelector" class="col-sm-1 col-form-label col-form-label-sm text-center">위반사항</label>
+          <!--<label for="violationSelector" class="col-sm-1 col-form-label col-form-label-sm text-center">위반사항</label>
           <div class="col-sm-1">
             <select class="form-select form-select-sm" id="violationSelector">
               <option value="">선택</option>
@@ -350,7 +493,7 @@
             <div class="row" id="violationDiv">
               <th:block th:each="violation:${crackdownStatus.violationList}">
                 <div class="col-6 violation">
-                  <input type="hidden" class="form-control form-control-sm fishingBoatInfo violationCd" th:value="${violation.violation}">
+                  <input type="hidden" class="form-control form-control-sm  violationCd" th:value="${violation.violation}">
                   <div class="input-group w-auto">
                     <th:block th:each="code:${vtList}">
                       <input type="text" class="form-control form-control-sm" th:if="${code.itemCd eq violation.violation}" th:value="${code.itemValue}">
@@ -362,30 +505,30 @@
                 </div>
               </th:block>
             </div>
-          </div>
+          </div>-->
         </div>
         <div class="row mb-1">
           <label for="permitNum" class="col-sm-1 col-form-label col-form-label-sm text-center">허가번호</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="permitNum" name="fishingBoat.permitNum" th:value="${crackdownStatus.fishingBoat.permitNum}">
+            <input type="text" class="form-control form-control-sm " id="permitNum" name="fishingBoat.permitNum" th:value="${crackdownStatus.fishingBoat.permitNum}">
           </div>
           <label for="nationality" class="col-sm-1 col-form-label col-form-label-sm text-center">국적</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="nationality" name="fishingBoat.nationality" th:value="${crackdownStatus.fishingBoat.nationality}">
+            <input type="text" class="form-control form-control-sm " id="nationality" name="fishingBoat.nationality" th:value="${crackdownStatus.fishingBoat.nationality}">
           </div>
           <label for="sailorCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">승선원</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="sailorCnt" name="fishingBoat.sailorCnt" placeholder="0인" th:value="${crackdownStatus.fishingBoat.sailorCnt}">
+            <input type="text" class="form-control form-control-sm " id="sailorCnt" name="fishingBoat.sailorCnt" placeholder="0인" th:value="${crackdownStatus.fishingBoat.sailorCnt>0?crackdownStatus.fishingBoat.sailorCnt:''}">
           </div>
           <label for="tonCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">톤수</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="tonCnt" name="fishingBoat.tonCnt" placeholder="000.00t" th:value="${crackdownStatus.fishingBoat.tonCnt}">
+            <input type="text" class="form-control form-control-sm " id="tonCnt" name="fishingBoat.tonCnt" placeholder="000.00t" th:value="${crackdownStatus.fishingBoat.tonCnt>0?crackdownStatus.fishingBoat.tonCnt:''}">
           </div>
         </div>
         <div class="row mb-1">
           <label for="fisheryType" class="col-sm-1 col-form-label col-form-label-sm text-center">선종</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm fishingBoatInfo" id="fisheryType" name="fishingBoat.fisheryType">
+            <select class="form-select form-select-sm " id="fisheryType" name="fishingBoat.fisheryType">
               <option value="">선택</option>
               <th:block th:each="code:${ftList}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.fishingBoat.fisheryType}"></option>
@@ -394,7 +537,7 @@
           </div>
           <label for="boatMaterial" class="col-sm-1 col-form-label col-form-label-sm text-center">선질</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm fishingBoatInfo" id="boatMaterial" name="fishingBoat.boatMaterial">
+            <select class="form-select form-select-sm " id="boatMaterial" name="fishingBoat.boatMaterial">
               <option value="">선택</option>
               <th:block th:each="code:${bmList}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.fishingBoat.boatMaterial}"></option>
@@ -404,52 +547,52 @@
           <label for="boatNnySung" class="col-sm-1 col-form-label col-form-label-sm text-center">선적지</label>
           <div class="col-sm-2">
             <div class="input-group w-auto">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="boatNnySung" name="fishingBoat.boatNnySung" placeholder="성" th:value="${crackdownStatus.fishingBoat.boatNnySung}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="boatNnySi" name="fishingBoat.boatNnySi" placeholder="시" th:value="${crackdownStatus.fishingBoat.boatNnySi}">
+              <input type="text" class="form-control form-control-sm " id="boatNnySung" name="fishingBoat.boatNnySung" placeholder="성" th:value="${crackdownStatus.fishingBoat.boatNnySung}">
+              <input type="text" class="form-control form-control-sm " id="boatNnySi" name="fishingBoat.boatNnySi" placeholder="시" th:value="${crackdownStatus.fishingBoat.boatNnySi}">
             </div>
           </div>
         </div>
+        <hr class="my-1">
         <div class="row mb-1">
           <label for="offenseType" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물</label>
-          <div class="col-sm-3">
+          <div class="col-sm-2">
             <div class="input-group w-auto">
-              <select class="form-select form-select-sm oxSelector">
+              <select class="form-select w-30 form-select-sm oxSelector" id="offenseSelector">
                 <option value="1" th:selected="${crackdownStatus.fishingBoat.offenseType eq null}">없음</option>
                 <option value="2" th:selected="${crackdownStatus.fishingBoat.offenseType ne null}">직접입력</option>
               </select>
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="offenseType" name="fishingBoat.offenseType" placeholder="범칙물" th:value="${crackdownStatus.fishingBoat.offenseType}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="offenseWeight" name="fishingBoat.offenseWeight" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseWeight>0?crackdownStatus.fishingBoat.offenseWeight:''}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
+              <input type="text" class="form-control w-40 form-control-sm " id="offenseType" name="fishingBoat.offenseType" placeholder="범칙물" th:value="${crackdownStatus.fishingBoat.offenseType}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
+              <input type="text" class="form-control w-30 form-control-sm " id="offenseWeight" name="fishingBoat.offenseWeight" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseWeight>0?crackdownStatus.fishingBoat.offenseWeight:''}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
             </div>
           </div>
-          <div class="col-sm-2"></div>
+          <label for="offenseIllegalWasteQuantity" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물 폐기량</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm " id="offenseIllegalWasteQuantity" name="fishingBoat.offenseIllegalWasteQuantity" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity>0?crackdownStatus.fishingBoat.offenseIllegalWasteQuantity:''}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
+          </div>
           <label for="offenseQuantity" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물 위판량</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="offenseQuantity" name="fishingBoat.offenseQuantity" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseQuantity}">
+            <input type="text" class="form-control form-control-sm " id="offenseQuantity" name="fishingBoat.offenseQuantity" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseQuantity>0?crackdownStatus.fishingBoat.offenseQuantity:''}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
           </div>
           <label for="offenseAmount" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">범칙물 위판금액</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="offenseAmount" name="fishingBoat.offenseAmount" placeholder="최대 999,999,999원" th:value="${crackdownStatus.fishingBoat.offenseAmount}">
+            <input type="text" class="form-control form-control-sm " id="offenseAmount" name="fishingBoat.offenseAmount" placeholder="단위: 만원" th:value="${crackdownStatus.fishingBoat.offenseAmount>0?crackdownStatus.fishingBoat.offenseAmount:''}" th:disabled="${crackdownStatus.fishingBoat.offenseType eq null}">
           </div>
         </div>
         <div class="row mb-1">
-          <label for="offenseIllegalWasteQuantity" class="col-sm-1 col-form-label col-form-label-sm text-center">범칙물 폐기량</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="offenseIllegalWasteQuantity" name="fishingBoat.offenseIllegalWasteQuantity" placeholder="000kg" th:value="${crackdownStatus.fishingBoat.offenseIllegalWasteQuantity}">
-          </div>
           <label for="damboUnpaidAmount" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 미납액</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="damboUnpaidAmount" name="fishingBoat.damboUnpaidAmount" placeholder="최대 999,999,999원" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount}">
+            <input type="text" class="form-control form-control-sm " id="damboUnpaidAmount" name="fishingBoat.damboUnpaidAmount" placeholder="단위: 만원" th:value="${crackdownStatus.fishingBoat.damboUnpaidAmount>0?crackdownStatus.fishingBoat.damboUnpaidAmount:''}">
           </div>
           <label for="damboPayment" class="col-sm-1 col-form-label col-form-label-sm text-center">담보금 납부액</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm fishingBoatInfo" id="damboPayment" name="fishingBoat.damboPayment" placeholder="최대 999,999,999원" th:value="${crackdownStatus.fishingBoat.damboPayment}">
+            <input type="text" class="form-control form-control-sm " id="damboPayment" name="fishingBoat.damboPayment" placeholder="단위: 만원" th:value="${crackdownStatus.fishingBoat.damboPayment>0?crackdownStatus.fishingBoat.damboPayment:''}">
           </div>
           <label for="paymentPaymentDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
           <div class="col-sm-2">
             <input type="hidden" id="paymentPaymentDt" name="fishingBoat.paymentPaymentDt" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd hh:mm')}">
             <div class="input-group">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo dateSelector" id="paymentPaymentDate" placeholder="0000-00-00" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="paymentPaymentTime"  placeholder="00:00" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'hh:mm')}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm  dateSelector" id="paymentPaymentDate" placeholder="yyyy-mm-dd" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
+              <input type="text" class="form-control form-control-sm  timeInputer" id="paymentPaymentTime"  placeholder="hh:mm" th:value="${#temporals.format(crackdownStatus.fishingBoat.paymentPaymentDt, 'hh:mm')}" autocomplete="off">
             </div>
           </div>
         </div>
@@ -466,11 +609,11 @@
                 <option value="1" th:selected="${!confiscationFlag}">없음</option>
                 <option value="2" th:selected="${confiscationFlag}">수량기입</option>
               </select>
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="confiscationFrame" name="fishingBoat.confiscationFrame" placeholder="틀" th:value="${crackdownStatus.fishingBoat.confiscationFrame}" th:disabled="${!confiscationFlag}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="confiscationWidth" name="fishingBoat.confiscationWidth" placeholder="폭" th:value="${crackdownStatus.fishingBoat.confiscationWidth}" th:disabled="${!confiscationFlag}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="confiscationJo" name="fishingBoat.confiscationJo" placeholder="조" th:value="${crackdownStatus.fishingBoat.confiscationJo}" th:disabled="${!confiscationFlag}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="confiscationGae" name="fishingBoat.confiscationGae" placeholder="개" th:value="${crackdownStatus.fishingBoat.confiscationGae}" th:disabled="${!confiscationFlag}">
-              <input type="text" class="form-control form-control-sm fishingBoatInfo" id="confiscationEtc" name="fishingBoat.confiscationEtc" placeholder="기타" th:value="${crackdownStatus.fishingBoat.confiscationEtc}" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm " id="confiscationFrame" name="fishingBoat.confiscationFrame" placeholder="틀" th:value="${crackdownStatus.fishingBoat.confiscationFrame}" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm " id="confiscationWidth" name="fishingBoat.confiscationWidth" placeholder="폭" th:value="${crackdownStatus.fishingBoat.confiscationWidth}" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm " id="confiscationJo" name="fishingBoat.confiscationJo" placeholder="조" th:value="${crackdownStatus.fishingBoat.confiscationJo}" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm " id="confiscationGae" name="fishingBoat.confiscationGae" placeholder="개" th:value="${crackdownStatus.fishingBoat.confiscationGae}" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm " id="confiscationEtc" name="fishingBoat.confiscationEtc" placeholder="기타" th:value="${crackdownStatus.fishingBoat.confiscationEtc}" th:disabled="${!confiscationFlag}">
             </div>
           </div>
         </div>
@@ -479,45 +622,98 @@
         <div class="row mb-1">
           <label for="processStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">처리현황</label>
           <div class="col-sm-2">
-            <select class="form-select form-select-sm processResultInfo" id="processStatus" name="processResult.processStatus">
+            <select class="form-select form-select-sm " id="processStatus" name="processResult.processStatus">
               <option value="">선택</option>
               <th:block th:each="code:${prList}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.processStatus}"></option>
               </th:block>
             </select>
           </div>
-          <label for="pressurizedTimeTakenDate" class="col-sm-1 col-form-label col-form-label-sm text-center">압송소요시간</label>
+          <label for="isIvsgtStop" class="col-sm-1 col-form-label col-form-label-sm text-center">수사중지여부</label>
           <div class="col-sm-2">
-            <th:block th:with="ptt=${crackdownStatus.processResult.pressurizedTimeTaken}">
-              <div class="input-group w-auto">
-                <input type="number" class="form-control form-control-sm pressurizedTimeTaken processResultInfo" id="pressurizedTimeTakenDate" placeholder="일" th:value="${#strings.substringBefore(ptt, '일')}">
-                <input type="text" class="form-control form-control-sm pressurizedTimeTaken processResultInfo" id="pressurizedTimeTakenTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(ptt, '일')}">
-              </div>
-              <input type="hidden" class="processResultInfo" name="processResult.pressurizedTimeTaken" id="pressurizedTimeTaken" th:value="${ptt}">
-            </th:block>
-          </div>
-          <label for="warrantReqTakeDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
-          <div class="col-sm-2">
-            <th:block th:with="wrtt=${crackdownStatus.processResult.warrantReqTakeTime}">
-            <div class="input-group w-auto">
-              <input type="number" class="form-control form-control-sm warrantReqTake processResultInfo" id="warrantReqTakeDate" placeholder="일" th:value="${#strings.substringBefore(wrtt, '일')}">
-              <input type="text" class="form-control form-control-sm warrantReqTake processResultInfo" id="warrantReqTakeTime" placeholder="00:00" autocomplete="off" th:value="${#strings.substringAfter(wrtt, '일')}">
-            </div>
-            <input type="hidden" class="processResultInfo" name="processResult.warrantReqTakeTime" id="warrantReqTake" th:value="${wrtt}">
-          </div>
-        </div>
-        <div class="row mb-1">
-          <label for="isIvsgtStop" class="col-sm-1 col-form-label col-form-label-sm text-center">수사중지 여부</label>
-          <div class="col-sm-2">
-            <select class="form-select form-select-sm processResultInfo" id="isIvsgtStop" name="processResult.isIvsgtStop">
+            <select class="form-select form-select-sm " id="isIvsgtStop" name="processResult.isIvsgtStop">
               <option value="">선택</option>
               <option value="Y" th:selected="${crackdownStatus.processResult.isIvsgtStop eq 'Y'}">O</option>
               <option value="N" th:selected="${crackdownStatus.processResult.isIvsgtStop eq 'N'}">X</option>
             </select>
           </div>
-          <label for="evictionDt" class="col-sm-1 col-form-label col-form-label-sm text-center">퇴거일</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고법원</label>
           <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="evictionDt" name="processResult.evictionDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.evictionDt}" autocomplete="off">
+            <input class="form-control form-control-sm" name="sentencingCourt" id="sentencingCourt" th:value="${crackdownStatus.processResult.sentencingCourt}">
+          </div>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고내용</label>
+          <div class="col-sm-2">
+            <input class="form-control form-control-sm" name="sentencingDetail" id="sentencingDetail" th:value="${crackdownStatus.processResult.sentencingDetail}">
+          </div>
+        </div>
+        <div class="row mb-1">
+          <label for="pressurizedTimeTakenDate" class="col-sm-1 col-form-label col-form-label-sm text-center">압송소요시간</label>
+          <div class="col-sm-2">
+            <th:block th:with="ptt=${crackdownStatus.processResult.pressurizedTimeTaken}">
+              <div class="input-group w-auto">
+                <input type="number" class="form-control form-control-sm pressurizedTimeTaken " id="pressurizedTimeTakenDate" placeholder="일" th:value="${#strings.substringBefore(ptt, '일')}">
+                <input type="text" class="form-control form-control-sm pressurizedTimeTaken timeInputer" id="pressurizedTimeTakenTime" placeholder="hh:mm" autocomplete="off" th:value="${#strings.substringAfter(ptt, '일')}">
+              </div>
+              <input type="hidden" class="" name="processResult.pressurizedTimeTaken" id="pressurizedTimeTaken" th:value="${ptt}">
+            </th:block>
+          </div>
+          <label for="distance" class="col-sm-1 col-form-label col-form-label-sm text-center">압송거리</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="distance" name="distance" placeholder="해리" th:value="${crackdownStatus.distance>0?crackdownStatus.distance:''}">
+          </div>
+          <label for="warrantReqTakeDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
+          <div class="col-sm-2">
+            <th:block th:with="wrtt=${crackdownStatus.processResult.warrantReqTakeTime}">
+              <div class="input-group w-auto">
+                <input type="number" class="form-control form-control-sm warrantReqTake " id="warrantReqTakeDate" placeholder="일" th:value="${#strings.substringBefore(wrtt, '일')}">
+                <input type="text" class="form-control form-control-sm warrantReqTake timeInputer" id="warrantReqTakeTime" placeholder="hh:mm" autocomplete="off" th:value="${#strings.substringAfter(wrtt, '일')}">
+              </div>
+              <input type="hidden" class="" name="processResult.warrantReqTakeTime" id="warrantReqTake" th:value="${wrtt}">
+            </th:block>
+          </div>
+        </div>
+        <div class="row mb-1">
+          <label for="napoDt" class="col-sm-1 col-form-label col-form-label-sm text-center">나포일시</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="napoDt" name="napoDt" placeholder="단속정보에서 입력" th:value="${#temporals.format(crackdownStatus.napoDt, 'yyyy-MM-dd hh:mm')}" readonly>
+          </div>
+          <label for="napoDt" class="col-sm-1 col-form-label col-form-label-sm text-center">석방일시</label>
+          <div class="col-sm-2">
+            <div class="input-group">
+              <input type="hidden" id="releaseDt" th:value="${#temporals.format(crackdownStatus.processResult.releaseDt, 'yyyy-MM-dd hh:mm')}">
+              <input type="text" class="form-control form-control-sm dateSelector" id="releaseDate" th:value="${#temporals.format(crackdownStatus.processResult.releaseDt, 'yyyy-MM-dd')}" placeholder="yyyy-mm-dd" readonly>
+              <input type="text" class="form-control form-control-sm timeInputer" id="releaseTime" th:value="${#temporals.format(crackdownStatus.processResult.releaseDt, 'hh:mm')}" placeholder="hh:mm">
+            </div>
+          </div>
+          <label for="napoDt" class="col-sm-1 col-form-label col-form-label-sm text-center">소요시간</label>
+          <div class="col-sm-2">
+            <input type="text" class="form-control form-control-sm" id="releaseToNapo" placeholder="석방일시-나포일시" readonly>
+          </div>
+        </div>
+        <hr class="my-1">
+        <div class="row mb-1">
+          <label for="consignmentStartDt" class="col-sm-1 col-form-label col-form-label-sm text-center">위탁여부</label>
+          <div class="col-sm-2">
+            <div class="input-group"
+                 th:with="consignmentFlag=${!#strings.isEmpty(crackdownStatus.processResult.consignmentStartDt) ||
+                                            !#strings.isEmpty(crackdownStatus.processResult.consignmentEndDt)}">
+              <select class="form-select form-select-sm w-30  oxSelector">
+                <option value="1" th:selected="${!consignmentFlag}">X</option>
+                <option value="2" th:selected="${consignmentFlag}">O</option>
+              </select>
+              <input type="text" class="form-control form-control-sm w-35 dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="위탁시작일" th:value="${crackdownStatus.processResult.consignmentStartDt}" autocomplete="off" th:disabled="${!consignmentFlag}">
+              <input type="text" class="form-control form-control-sm w-35 dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="위탁종료일" th:value="${crackdownStatus.processResult.consignmentEndDt}" autocomplete="off" th:disabled="${!consignmentFlag}">
+            </div>
+          </div>
+          <label for="evictionDt" class="col-sm-1 col-form-label col-form-label-sm text-center">퇴거여부</label>
+          <div class="col-sm-2">
+            <div class="input-group" th:with="evictionFlag=${!#strings.isEmpty(crackdownStatus.processResult.evictionDt)}">
+              <select class="form-select form-select-sm w-30  oxSelector">
+                <option value="1" th:selected="${!evictionFlag}">X</option>
+                <option value="2" th:selected="${evictionFlag}">O</option>
+              </select>
+              <input type="text" class="form-control form-control-sm w-70 dateSelector" id="evictionDt" name="processResult.evictionDt" placeholder="퇴거일" th:value="${crackdownStatus.processResult.evictionDt}" th:disabled="${!evictionFlag}" autocomplete="off">
+            </div>
           </div>
         </div>
         <th:block th:with="directHandoverFlag=${crackdownStatus.processResult.directHandoverDt ne null ||
@@ -528,7 +724,7 @@
           <div class="row mb-1">
             <label for="directHandoverSelector" class="col-sm-1 col-form-label col-form-label-sm text-center">직접인계여부</label>
             <div class="col-sm-2">
-              <select class="form-select form-select-sm processResultInfo" id="directHandoverSelector">
+              <select class="form-select form-select-sm " id="directHandoverSelector">
                 <option value="1" th:selected="${!directHandoverFlag}">X</option>
                 <option value="2" th:selected="${directHandoverFlag}">O</option>
               </select>
@@ -537,88 +733,86 @@
           <div class="row mb-1" id="directHandoverDiv">
             <label for="directHandoverDt" class="col-sm-1 col-form-label col-form-label-sm text-center">직접인계일</label>
             <div class="col-sm-2">
-              <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="directHandoverDt" name="processResult.directHandoverDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.directHandoverDt}" autocomplete="off" th:disabled="${!directHandoverFlag}">
+              <input type="text" class="form-control form-control-sm  dateSelector" id="directHandoverDt" name="processResult.directHandoverDt" placeholder="yyyy-mm-dd" th:value="${crackdownStatus.processResult.directHandoverDt}" autocomplete="off" th:disabled="${!directHandoverFlag}">
             </div>
             <label for="handoverSeaPointLon" class="col-sm-1 col-form-label col-form-label-sm text-center">인계 해점</label>
             <div class="col-sm-2">
               <div class="input-group w-auto">
-                <input type="text" class="form-control form-control-sm processResultInfo" id="handoverSeaPointLon" name="processResult.handoverSeaPointLon" placeholder="00-00.00N" th:value="${crackdownStatus.processResult.handoverSeaPointLon}" th:disabled="${!directHandoverFlag}">
-                <input type="text" class="form-control form-control-sm processResultInfo" id="handoverSeaPointLat" name="processResult.handoverSeaPointLat" placeholder="000-00.00E" th:value="${crackdownStatus.processResult.handoverSeaPointLat}" th:disabled="${!directHandoverFlag}">
+                <input type="text" class="form-control form-control-sm " id="handoverSeaPointLon" name="processResult.handoverSeaPointLon" placeholder="00-00.00N" th:value="${crackdownStatus.processResult.handoverSeaPointLon}" th:disabled="${!directHandoverFlag}">
+                <input type="text" class="form-control form-control-sm " id="handoverSeaPointLat" name="processResult.handoverSeaPointLat" placeholder="000-00.00E" th:value="${crackdownStatus.processResult.handoverSeaPointLat}" th:disabled="${!directHandoverFlag}">
               </div>
             </div>
             <label for="handoverBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">인계 함정</label>
             <div class="col-sm-2">
-              <input type="text" class="form-control form-control-sm processResultInfo" id="handoverBoat" name="processResult.handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}" th:disabled="${!directHandoverFlag}">
+              <input type="text" class="form-control form-control-sm " id="handoverBoat" name="processResult.handoverBoat" th:value="${crackdownStatus.processResult.handoverBoat}" th:disabled="${!directHandoverFlag}">
             </div>
             <label for="middleTakeoverBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">중측 인수함정</label>
             <div class="col-sm-2">
-              <input type="text" class="form-control form-control-sm processResultInfo" id="middleTakeoverBoat" name="processResult.middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}" th:disabled="${!directHandoverFlag}">
+              <input type="text" class="form-control form-control-sm " id="middleTakeoverBoat" name="processResult.middleTakeoverBoat" th:value="${crackdownStatus.processResult.middleTakeoverBoat}" th:disabled="${!directHandoverFlag}">
             </div>
           </div>
         </th:block>
-        <hr>
         <div class="row mb-1">
-          <label for="consignmentStartDt" class="col-sm-1 col-form-label col-form-label-sm text-center">위탁시작일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentStartDt" name="processResult.consignmentStartDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentStartDt}" autocomplete="off">
-          </div>
-          <label for="consignmentEndDt" class="col-sm-1 col-form-label col-form-label-sm text-center">위탁종료일</label>
-          <div class="col-sm-2">
-            <input type="text" class="form-control form-control-sm processResultInfo dateSelector" id="consignmentEndDt" name="processResult.consignmentEndDt" placeholder="0000-00-00" th:value="${crackdownStatus.processResult.consignmentEndDt}" autocomplete="off">
-          </div>
           <label for="confiscationDt" class="col-sm-1 col-form-label col-form-label-sm text-center">몰수여부</label>
           <div class="col-sm-2">
             <div class="input-group" th:with="confiscationFlag=${!#strings.isEmpty(crackdownStatus.processResult.confiscationDt)}">
-              <select class="form-select form-select-sm w-30 processResultInfo oxSelector">
+              <select class="form-select form-select-sm w-30  oxSelector">
                 <option value="1" th:selected="${!confiscationFlag}">X</option>
                 <option value="2" th:selected="${confiscationFlag}">O</option>
               </select>
-              <input type="text" class="form-control form-control-sm w-70 processResultInfo dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="몰수확정일" th:value="${crackdownStatus.processResult.confiscationDt}" autocomplete="off" th:disabled="${!confiscationFlag}">
+              <input type="text" class="form-control form-control-sm w-70  dateSelector" id="confiscationDt" name="processResult.confiscationDt" placeholder="몰수확정일" th:value="${crackdownStatus.processResult.confiscationDt}" autocomplete="off" th:disabled="${!confiscationFlag}">
             </div>
           </div>
-        </div>
-        <div class="row mb-1">
           <label for="boatDisposalDt" class="col-sm-1 col-form-label col-form-label-sm text-center">폐선여부</label>
-          <div class="col-sm-3">
+          <div class="col-sm-2">
             <div class="input-group" th:with="disposalFlag=${crackdownStatus.processResult.boatDisposalDt ne null}">
-              <select class="form-select form-select-sm w-30 processResultInfo oxSelector">
+              <select class="form-select form-select-sm w-30  oxSelector">
                 <option value="1" th:selected="${!disposalFlag}">X</option>
                 <option value="2" th:selected="${disposalFlag}">O</option>
               </select>
-              <input type="text" class="form-control form-control-sm w-35 processResultInfo dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="폐선일" th:value="${crackdownStatus.processResult.boatDisposalDt}" autocomplete="off" th:disabled="${!disposalFlag}">
-              <select class="form-select form-select-sm w-35 processResultInfo" id="boatDisposalType" name="processResult.boatDisposalType" th:disabled="${!disposalFlag}">
-                <option value="">폐선 종류 선택</option>
+              <input type="text" class="form-control form-control-sm w-35  dateSelector" id="boatDisposalDt" name="processResult.boatDisposalDt" placeholder="폐선일" th:value="${crackdownStatus.processResult.boatDisposalDt}" autocomplete="off" th:disabled="${!disposalFlag}">
+              <select class="form-select form-select-sm w-35 " id="boatDisposalType" name="processResult.boatDisposalType" th:disabled="${!disposalFlag}">
+                <option value="">종류 선택</option>
                 <th:block th:each="code:${bdtList}">
                   <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownStatus.processResult.boatDisposalType}"></option>
                 </th:block>
               </select>
             </div>
           </div>
-          <div class="col-sm-2"></div>
+          <label for="exileDt" class="col-sm-1 col-form-label col-form-label-sm text-center">침몰여부</label>
+          <div class="col-sm-2">
+            <div class="input-group" th:with="exileFlag=${!#strings.isEmpty(crackdownStatus.processResult.exileDt)}">
+              <select class="form-select form-select-sm w-30  oxSelector">
+                <option value="1" th:selected="${!exileFlag}">X</option>
+                <option value="2" th:selected="${exileFlag}">O</option>
+              </select>
+              <input type="text" class="form-control form-control-sm w-70  dateSelector" id="exileDt" name="processResult.exileDt" placeholder="침몰일" th:value="${crackdownStatus.processResult.exileDt}" autocomplete="off" th:disabled="${!exileFlag}">
+            </div>
+          </div>
           <label for="returnDt" class="col-sm-1 col-form-label col-form-label-sm text-center">환부여부</label>
           <div class="col-sm-2">
             <div class="input-group" th:with="returnFlag=${!#strings.isEmpty(crackdownStatus.processResult.returnDt)}">
-              <select class="form-select form-select-sm w-30 processResultInfo oxSelector">
+              <select class="form-select form-select-sm w-30  oxSelector">
                 <option value="1" th:selected="${!returnFlag}">X</option>
                 <option value="2" th:selected="${returnFlag}">O</option>
               </select>
-              <input type="text" class="form-control form-control-sm w-70 processResultInfo dateSelector" id="returnDt" name="processResult.returnDt" placeholder="환부일" th:value="${crackdownStatus.processResult.returnDt}" autocomplete="off" th:disabled="${!returnFlag}">
+              <input type="text" class="form-control form-control-sm w-70  dateSelector" id="returnDt" name="processResult.returnDt" placeholder="환부일" th:value="${crackdownStatus.processResult.returnDt}" autocomplete="off" th:disabled="${!returnFlag}">
             </div>
           </div>
         </div>
-        <hr>
+        <hr class="my-1">
         <div class="row mb-1">
           <th:block th:if="${#lists.isEmpty(crackdownStatus.sailorList)}">
             <label for="captainRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">선장구속</label>
             <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="captainRestriction">
+              <select class="form-select form-select-sm " id="captainRestriction">
                 <option value="Y">O</option>
                 <option value="N">X</option>
               </select>
             </div>
             <label for="navigatingOfficerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">항해장구속</label>
             <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="navigatingOfficerRestriction">
+              <select class="form-select form-select-sm " id="navigatingOfficerRestriction">
                 <option value="">없음</option>
                 <option value="Y">O</option>
                 <option value="N">X</option>
@@ -626,7 +820,7 @@
             </div>
             <label for="chiefEngineerRestriction" class="col-sm-1 col-form-label col-form-label-sm text-center">기관장구속</label>
             <div class="col-sm-2">
-              <select class="form-select form-select-sm sailorInfo" id="chiefEngineerRestriction">
+              <select class="form-select form-select-sm " id="chiefEngineerRestriction">
                 <option value="">없음</option>
                 <option value="Y">O</option>
                 <option value="N">X</option>
@@ -638,7 +832,7 @@
             <div class="col-sm-2">
               <th:block th:each="sailor:${crackdownStatus.sailorList}">
                 <th:block th:if="${sailor.position eq 'POS001'}">
-                  <select class="form-select form-select-sm sailorInfo" id="captainRestriction">
+                  <select class="form-select form-select-sm " id="captainRestriction">
                     <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
                     <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
                   </select>
@@ -651,7 +845,7 @@
                 <th:block th:if="${sailor.position eq 'POS002'}">
                   <input type="hidden" id="navigatingOfficerKey" th:value="${sailor.sailorKey}">
                   <input type="hidden" id="navigatingOfficerStatus" th:value="${sailor.status}">
-                  <select class="form-select form-select-sm sailorInfo" id="navigatingOfficerRestriction">
+                  <select class="form-select form-select-sm " id="navigatingOfficerRestriction">
                     <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
                     <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
                   </select>
@@ -664,7 +858,7 @@
                 <th:block th:if="${sailor.position eq 'POS003'}">
                   <input type="hidden" id="chiefEngineerKey" th:value="${sailor.sailorKey}">
                   <input type="hidden" id="chiefEngineerStatus" th:value="${sailor.status}">
-                  <select class="form-select form-select-sm sailorInfo" id="chiefEngineerRestriction">
+                  <select class="form-select form-select-sm " id="chiefEngineerRestriction">
                     <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
                     <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
                   </select>
@@ -676,7 +870,7 @@
         <div class="row mb-3">
           <label for="sailorAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
             선원구속
-            <button type="button" class="border-0 bg-white sailorInfo" id="sailorAddBtn">
+            <button type="button" class="border-0 bg-white " id="sailorAddBtn">
               <i class="bi bi-plus-square text-primary"></i>
             </button>
           </label>
@@ -687,17 +881,17 @@
                   <input type="hidden" class="sailorKey" th:value="${sailor.sailorKey}">
                   <input type="hidden" class="sailorStatus" th:value="${sailor.status}">
                   <div class="input-group">
-                    <select class="form-select form-select-sm sailorInfo isRestriction normalSailorPosition" style="width: 75px">
+                    <select class="form-select form-select-sm  isRestriction normalSailorPosition" style="width: 75px">
                       <option value="">직책</option>
                       <option value="POS005" th:selected="${sailor.position eq 'POS005'}">기타 간부선원</option>
                       <option value="POS006" th:selected="${sailor.position eq 'POS006'}">일반선원 또는 확인불가</option>
                     </select>
-                    <select class="form-select form-select-sm sailorInfo isRestriction w-auto normalSailorRestriction">
+                    <select class="form-select form-select-sm  isRestriction w-auto normalSailorRestriction">
                       <option value="Y" th:selected="${sailor.isRestriction eq 'Y'}">O</option>
                       <option value="N" th:selected="${sailor.isRestriction eq 'N'}">X</option>
                     </select>
-                    <input type="text" class="form-control form-control-sm sailorInfo normalSailorNm w-auto" placeholder="이름" th:value="${sailor.sailorNameKr}">
-                    <button type="button" class="btn btn-sm btn-outline-secondary sailorInfo w-auto opacity-75 sailorRemoveBtn">
+                    <input type="text" class="form-control form-control-sm  normalSailorNm w-auto" placeholder="이름" th:value="${sailor.sailorNameKr}">
+                    <button type="button" class="btn btn-sm btn-outline-secondary  w-auto opacity-75 sailorRemoveBtn">
                       <i class="bi bi-dash-square text-danger"></i>
                     </button>
                   </div>
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html
index 21525429..e7e41b10 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html
@@ -49,7 +49,7 @@
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="caseAgency">
-                          <option value="">사건담당기관</option>
+                          <option value="">사건담당경찰서</option>
                           <th:block th:each="code:${session.commonCode.get('ATA')}">
                             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
                           </th:block>
@@ -164,7 +164,7 @@
                       <th></th>
                       <th>나포일시</th>
                       <th>나포해점</th>
-                      <th>사건담당기관</th>
+                      <th>사건담당경찰서</th>
                       <th>단속경찰서</th>
                       <th>단속함정</th>
                       <th>선명</th>
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
index 2c57865f..bd96ed9a 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html
@@ -34,7 +34,7 @@
         </div>
       </div>
       <div class="row border border-secondary border-top-0">
-        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold py-2 border-end border-secondary text-center">사건담당기관</label>
+        <label class="col-sm-1 col-form-label col-form-label-sm fw-bold py-2 border-end border-secondary text-center">사건담당경찰서</label>
         <div class="col-sm-2 border-end border-secondary">
           <th:block th:each="code:${ataList}">
             <input type="text" class="form-control form-control-sm border-0" readonly th:if="${code.itemCd eq crackdownStatus.caseAgency}" th:value="${code.itemValue}">