diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue
index 6f858aa0d..7f4ed0899 100644
--- a/src/modules/04_registry/components/Information/Certicate.vue
+++ b/src/modules/04_registry/components/Information/Certicate.vue
@@ -858,6 +858,8 @@ watch(
       } else {
         inputIssueDate.value = "";
       }
+    }else if(value.length === 0){
+      issueDate.value = null
     }
   }
 );
@@ -872,6 +874,8 @@ watch(
       } else {
         inputExpireDate.value = "";
       }
+    }else if(value.length === 0){
+      expireDate.value = null
     }
   }
 );
diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index deeee17af..5e6747074 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -79,6 +79,7 @@
                 :error="yearInputCheck"
                 error-message="กรุณากรอก ปี ที่ยื่นขอพระราชทานเครื่องราชฯ"
               />
+              
               <datepicker
                 v-else
                 menu-class-name="modalfix"
@@ -102,7 +103,7 @@
                     dense
                     lazy-rules
                     :borderless="!edit"
-                    :model-value="year + 543"
+                    :model-value="year !== 0 ? (year as number) + 543:null"
                     :rules="[
                       (val:string) =>
                         !!val ||
@@ -576,7 +577,7 @@ const OpsFilter = ref<InsigniaOps>({
   insigniaOptions: [],
 });
 const insigniaType = ref<string>();
-const year = ref<number>(0);
+const year = ref<number|null>(0);
 const no = ref<string>();
 const issue = ref<string>();
 const volumeNo = ref<string>();
@@ -1043,6 +1044,7 @@ const fetchData = async () => {
             createdAt: e.createdAt,
           });
         });
+        console.log(data)
       })
       .catch((e) => {
         messageError($q, e);
@@ -1081,7 +1083,7 @@ const getData = () => {
   const row = rows.value[rowIndex.value];
   insigniaId.value = row.insigniaId;
   insigniaType.value = row.insigniaType;
-  year.value = row.year;
+  year.value = row.year == null ? null:row.year;
   no.value = row.no;
   issue.value = row.issue;
   volumeNo.value = row.volumeNo;
@@ -1093,7 +1095,7 @@ const getData = () => {
   refCommandNo.value = row.refCommandNo;
   refCommandDate.value = row.refCommandDate;
   id.value = row.id;
-  yearInput.value = (Number(row.year) + 543).toLocaleString();
+  yearInput.value = row.year !== 0 ? (Number(row.year) + 543).toLocaleString():'';
   receiveDateInput.value = row.receiveDate
     ? convertDateDisplay(row.receiveDate)
     : "";
@@ -1303,7 +1305,7 @@ const selectData = async (props: DataProps) => {
   rowIndex.value = props.rowIndex;
   insigniaId.value = props.row.insigniaId;
   insigniaType.value = props.row.insigniaType;
-  year.value = props.row.year;
+  year.value = props.row.year == 0 ? 0:props.row.year;
   no.value = props.row.no;
   issue.value = props.row.issue;
   volumeNo.value = props.row.volumeNo;
@@ -1318,7 +1320,7 @@ const selectData = async (props: DataProps) => {
     props.row.refCommandDate == "-" ? null : props.row.refCommandDate;
   id.value = props.row.id;
 
-  yearInput.value = (Number(props.row.year) + 543).toLocaleString();
+  yearInput.value = props.row.year !== 0 ? (Number(props.row.year) + 543).toLocaleString():'';
   receiveDateInput.value = convertDateDisplay(props.row.receiveDate);
   dateAnnounceInput.value = props.row.dateAnnounce
     ? convertDateDisplay(props.row.dateAnnounce as Date)
@@ -1466,6 +1468,9 @@ watch(
         dateAnnounceInput.value = "";
       }
     }
+    else if (value.length === 0) {
+      dateAnnounce.value = null;
+    }
   }
 );
 watch(
@@ -1479,6 +1484,9 @@ watch(
         refCommandDateInput.value = "";
       }
     }
+    else if (value.length === 0) {
+      refCommandDate.value = null;
+    }
   }
 );
 
@@ -1506,6 +1514,9 @@ watch(
       yearInputCheck.value = false;
       year.value = dateVal;
     }
+    else if (value.length === 0) {
+      year.value = 0;
+    }
   }
 );
 </script>
diff --git a/src/modules/04_registry/components/Train.vue b/src/modules/04_registry/components/Train.vue
index 62113bd90..3acc1c6b5 100644
--- a/src/modules/04_registry/components/Train.vue
+++ b/src/modules/04_registry/components/Train.vue
@@ -29,7 +29,9 @@
                     ? props.row.startDate2 !== null
                       ? date2Thai(props.row.startDate2)
                       : "-"
-                    :  props.row.startDate2 !== null ? col.value + 543:'-'
+                    : props.row.startDate2 !== null
+                    ? col.value + 543
+                    : "-"
                 }}
               </div>
               <div v-else-if="col.name == 'endDate'" class="table_ellipsis">
@@ -38,7 +40,9 @@
                     ? props.row.endDate2 !== null
                       ? date2Thai(props.row.endDate2)
                       : "-"
-                    : props.row.endDate2 !== null ? col.value + 543:'-'
+                    : props.row.endDate2 !== null
+                    ? col.value + 543
+                    : "-"
                 }}
               </div>
 
@@ -166,7 +170,9 @@
                             dense
                             lazy-rules
                             :borderless="!edit"
-                            :model-value="startDate !== 0 ? Number(startDate) + 543:null"
+                            :model-value="
+                              startDate !== 0 ? Number(startDate) + 543 : null
+                            "
                             :label="`${'ปี เริ่มต้นการฝึกอบรม/ดูงาน'}`"
                           >
                             <template v-slot:prepend>
@@ -278,7 +284,9 @@
                             dense
                             lazy-rules
                             :borderless="!edit"
-                            :model-value="endDate !== 0 ? Number(endDate) + 543:null"
+                            :model-value="
+                              endDate !== 0 ? Number(endDate) + 543 : null
+                            "
                             :rules="[
                               (val) =>
                                 !!val ||
@@ -1046,8 +1054,8 @@ const getData = () => {
   numberOrder.value = row.numberOrder;
   dateOrder.value = row.dateOrder;
   isDate.value = row.isDate;
-  startDate.value = row.startDate !== null ? row.startDate as number:0;
-  endDate.value = row.endDate !== null ? row.endDate as number:0;
+  startDate.value = row.startDate !== null ? (row.startDate as number) : 0;
+  endDate.value = row.endDate !== null ? (row.endDate as number) : 0;
   startDate2.value = row.startDate2;
   endDate2.value = row.endDate2;
   id.value = row.id;
@@ -1146,13 +1154,17 @@ const saveData = async () => {
             ? startDate2.value
               ? dateToISO(startDate2.value as Date)
               : null
-            : startDate.value !== 0 ? new Date(`${startDate.value}-01-01`):null,
+            : startDate.value !== 0
+            ? new Date(`${startDate.value}-01-01`)
+            : null,
         endDate:
           isDate.value == "true"
             ? endDate2.value
               ? dateToISO(endDate2.value as Date)
               : null
-            : endDate.value !== 0 ? new Date(`${endDate.value}-01-01`):null,
+            : endDate.value !== 0
+            ? new Date(`${endDate.value}-01-01`)
+            : null,
       })
       .then((res) => {
         success($q, "บันทึกข้อมูลสำเร็จ");
@@ -1185,17 +1197,21 @@ const editData = async () => {
       dateOrder: dateOrder.value,
       isDate: isDate.value == "true" ? true : false,
       startDate:
-          isDate.value == "true"
-            ? startDate2.value
-              ? dateToISO(startDate2.value as Date)
-              : null
-            : startDate.value !== 0 ? new Date(`${startDate.value}-01-01`):null,
-        endDate:
-          isDate.value == "true"
-            ? endDate2.value
-              ? dateToISO(endDate2.value as Date)
-              : null
-            : endDate.value !== 0 ? new Date(`${endDate.value}-01-01`):null,
+        isDate.value == "true"
+          ? startDate2.value
+            ? dateToISO(startDate2.value as Date)
+            : null
+          : startDate.value !== 0
+          ? new Date(`${startDate.value}-01-01`)
+          : null,
+      endDate:
+        isDate.value == "true"
+          ? endDate2.value
+            ? dateToISO(endDate2.value as Date)
+            : null
+          : endDate.value !== 0
+          ? new Date(`${endDate.value}-01-01`)
+          : null,
     })
     .then((res) => {
       success($q, "บันทึกข้อมูลสำเร็จ");
@@ -1268,7 +1284,7 @@ const clickClose = async () => {
  * @param props ค่า props ใน row ที่เลือก
  */
 const selectData = async (props: DataProps) => {
-  console.log(props)
+  console.log(props);
   modalEdit.value = true;
   modal.value = true;
   edit.value = false;
@@ -1284,8 +1300,10 @@ const selectData = async (props: DataProps) => {
   numberOrder.value = props.row.numberOrder;
   dateOrder.value = props.row.dateOrder;
   isDate.value = props.row.isDate;
-  startDate.value = props.row.startDate !== null ? props.row.startDate as number:0;
-  endDate.value = props.row.endDate !== null ? props.row.endDate as number:0;
+  startDate.value =
+    props.row.startDate !== null ? (props.row.startDate as number) : 0;
+  endDate.value =
+    props.row.endDate !== null ? (props.row.endDate as number) : 0;
   startDate2.value = props.row.startDate2;
   endDate2.value = props.row.endDate2;
   inputStartDate.value =
@@ -1448,6 +1466,9 @@ watch(
         inputStartDate2.value = "";
       }
     }
+    else if (value.length === 0) {
+      startDate2.value = null;
+    }
   }
 );
 watch(
@@ -1461,6 +1482,9 @@ watch(
         inputEndDate2.value = "";
       }
     }
+    else if (value.length === 0) {
+      endDate2.value = null;
+    }
   }
 );
 watch(
@@ -1483,6 +1507,9 @@ watch(
       const dateVal = Number(value) - 543;
       startDate.value = dateVal;
     }
+    else if (value.length === 0) {
+      startDate.value = 0;
+    }
   }
 );
 watch(
@@ -1492,6 +1519,9 @@ watch(
       const dateVal = Number(value) - 543;
       endDate.value = dateVal;
     }
+    else if (value.length === 0) {
+      endDate.value = 0;
+    }
   }
 );
 
@@ -1501,6 +1531,9 @@ watch(
     if (value.length === 4) {
       const dateVal = Number(value) - 543;
       yearly.value = dateVal;
+    } 
+    else if (value.length === 0) {
+      yearly.value = 0;
     }
   }
 );