diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 2b49cab89..197912cb3 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -329,6 +329,9 @@ async function fetchDatadetail() {
     formData.persons = props.data.persons ?? [];
     formData.disciplinaryDateStart = props.data.disciplinaryDateStart ?? null;
     formData.disciplinaryDateEnd = props.data.disciplinaryDateEnd ?? null;
+    formData.daysExtend = props.data.daysExtend ?? 0;
+    formData.disciplinaryDateInvestigation = props.data.disciplinaryDateInvestigation ?? null;
+    formData.disciplinaryDateResult = props.data.disciplinaryDateResult ?? null;
     disciplineDisciplinary_DocSummaryEvidences.value =
       props.data.disciplineDisciplinary_DocSummaryEvidences;
     disciplineDisciplinary_DocRecordAccusers.value =
@@ -338,6 +341,9 @@ async function fetchDatadetail() {
     disciplineDisciplinary_DocOthers.value =
       props.data.disciplineDisciplinary_DocOthers;
 
+    disciplineDisciplinary_DocRelevants.value =
+      props.data.disciplineDisciplinary_DocRelevants;
+
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     let datalistDirector: responseType[] = formData.directors.map(
       (e: directorType) => ({
@@ -1292,9 +1298,7 @@ onMounted(async () => {
                               (val) =>
                                 !!val || `${'กรุณาเลือกร้ายแรง/ไม่ร้ายแรง'}`,
                             ]"
-                            :options="
-                              investigateDis.causeTextOptions
-                            "
+                            :options="investigateDis.causeTextOptions"
                             label="ร้ายแรง/ไม่ร้ายแรง"
                             emit-value
                             map-options
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index 7a4b7a283..6eec56c72 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -30,9 +30,9 @@ export const useInvestigateDisStore = defineStore(
 
     const offenseDetailsOps = ref<DataOption[]>([
       { id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
-      { id: "NOT_DEADLY", name: "ไม่ร้ายแรง" },
-      { id: "DEADLY", name: "ร้ายแรง" },
-    ]);
+      { id: "HAVE_CAUSE", name: "มีมูล" },
+      { id: "NO_CAUSE", name: "ไม่มีมูล" },
+  ]);
 
     const optionsfaultLevel = ref<DataOptioGroup[]>([
       { id: "0", name: "ไม่ร้ายแรง", disable: true },