diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index 07a196511..1b549c6be 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -130,6 +130,8 @@ const openModal = () => (modal.value = true);
 const file = ref<any>(null);
 const fileList = ref<FileList[]>([]);
 const isNoDebt = ref<boolean>(false);
+const isNoBurden = ref<boolean>(false);
+const isDiscipline = ref<boolean>(false);
 const checkboxGroup = ref<CheckBoxType[]>([]);
 const checkboxOp = ref<CheckBoxType[]>([
   { label: "ไม่เป็นหนี้สหกรณ์", value: "debt" },
@@ -201,6 +203,8 @@ const fetchData = async (id: string) => {
       status.value = data.status ?? "";
       remarkHorizontal.value = data.remarkHorizontal ?? "-";
       isNoDebt.value = data.isNoDebt;
+      isNoBurden.value = data.isNoBurden;
+      isDiscipline.value = data.isDiscipline;
     })
     .catch((e) => {
       messageError($q, e);
@@ -309,6 +313,8 @@ const onSubmitConditions = () => {
     http
       .put(config.API.resignConditions(id.value), {
         isNoDebt: isNoDebt.value,
+        isNoBurden: isNoBurden.value,
+        isDiscipline: isDiscipline.value,
       })
       .then(() => {
         fetchData(id.value);
@@ -777,12 +783,30 @@ function removeFile(fileName: string) {
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <q-checkbox
-            v-model="isNoDebt"
-            label="ไม่เป็นหนี้สหกรณ์"
-            color="teal"
-            :disable="!conditions"
-          />
+          <div class="col-12">
+            <q-checkbox
+              v-model="isNoDebt"
+              label="ไม่เป็นหนี้สหกรณ์"
+              color="teal"
+              :disable="!conditions"
+            />
+          </div>
+          <div class="col-12">
+            <q-checkbox
+              v-model="isNoBurden"
+              label="ไม่มีภาระผูกพันค้ำประกันทุนการศึกษา"
+              color="teal"
+              :disable="!conditions"
+            />
+          </div>
+          <div class="col-12">
+            <q-checkbox
+              v-model="isDiscipline"
+              label="ไม่มีพฤติการณ์ทางวินัย"
+              color="teal"
+              :disable="!conditions"
+            />
+          </div>
           <!-- <q-option-group
             :options="checkboxOp"
             type="checkbox"