diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
index f3d8c4bdc..bf329724d 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
@@ -10,6 +10,7 @@ import timeGridPlugin from "@fullcalendar/timegrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import allLocales from "@fullcalendar/core/locales-all";
 import listPlugin from "@fullcalendar/list";
+import moment from "moment";
 
 import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave";
 import type { ExtendHistoryObject } from "@/modules/11_discipline/interface/response/Main";
@@ -98,7 +99,7 @@ async function fetchCalendar() {
       id: index.toString(),
       title: e.name,
       start: e.dateStart,
-      end: e.dateEnd,
+      end: moment(e.dateEnd).format("YYYY-MM-DD")+ " 23:59:59",
       allDay: false,
       color:
         props.lists.length > 1 && index > 0
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index a4ede68e3..880fa2d8a 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -2,6 +2,8 @@
 import { useRouter, useRoute } from "vue-router";
 import { onMounted, ref, watch, reactive, computed } from "vue";
 import { useQuasar } from "quasar";
+import moment from "moment";
+
 import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import Table from "@/modules/11_discipline/components/DirectorTable.vue";
@@ -176,6 +178,22 @@ function onSubmit() {
   dialogConfirm(
     $q,
     async () => {
+      if (
+        formData.investigationDateStart !== null &&
+        formData.investigationDateEnd !== null
+      ) {
+        const investigationDateStart = new Date(
+          formData.investigationDateStart
+        );
+        const investigationDateEnd = new Date(formData.investigationDateEnd);
+
+        formData.investigationDateStart = moment(investigationDateStart).format(
+          "YYYY-MM-DD"
+        );
+        formData.investigationDateEnd =
+          moment(investigationDateEnd).format("YYYY-MM-DD");
+      }
+
       if (mainStore.rowsAdd) {
         formData.persons = mainStore.rowsAdd;
       }
@@ -196,7 +214,7 @@ async function calEndDate(val: string) {
   changeFormData();
   const date = await new Date(props.data.investigationDateEnd);
   formData.investigationDateEnd = await new Date(
-    date.setDate(date.getDate() + Number(val))
+    date.setDate(date.getDate() + (Number(val) + 1))
   );
 }
 
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
index 1be91d0ad..b079b5182 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
@@ -10,6 +10,7 @@ import timeGridPlugin from "@fullcalendar/timegrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import allLocales from "@fullcalendar/core/locales-all";
 import listPlugin from "@fullcalendar/list";
+import moment from "moment";
 
 import type { DataDateMonthObject } from "@/modules/09_leave/interface/response/leave";
 import type { ExtendHistoryObject } from "@/modules/11_discipline/interface/response/Main";
@@ -98,7 +99,7 @@ async function fetchCalendar() {
       id: index.toString(),
       title: e.name,
       start: e.dateStart,
-      end: e.dateEnd,
+      end: moment(e.dateEnd).format("YYYY-MM-DD")+ " 23:59:59",
       allDay: false,
       color:
         props.lists.length > 1 && index > 0
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 1fd422cfa..01413f741 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -6,7 +6,8 @@ import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import CalandarDialog from "@/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue";
 /**import type*/
-import type { QTableProps } from "quasar";
+import moment from "moment";
+
 import type {
   FormData,
   DisciplinaryRef,
@@ -201,7 +202,7 @@ async function calEndDate(val: string) {
   changeFormData();
   const date = await new Date(props.data.disciplinaryDateEnd);
   formData.disciplinaryDateEnd = await new Date(
-    date.setDate(date.getDate() + Number(val))
+    date.setDate(date.getDate() + (Number(val) + 1))
   );
 }
 
@@ -214,6 +215,22 @@ function onSubmit() {
   dialogConfirm(
     $q,
     async () => {
+      if (
+        formData.disciplinaryDateStart !== null &&
+        formData.disciplinaryDateEnd !== null
+      ) {
+        const disciplinaryDateStart = new Date(
+          formData.disciplinaryDateStart
+        );
+        const disciplinaryDateEnd = new Date(formData.disciplinaryDateEnd);
+
+        formData.disciplinaryDateStart = moment(disciplinaryDateStart).format(
+          "YYYY-MM-DD"
+        );
+        formData.disciplinaryDateEnd =
+          moment(disciplinaryDateEnd).format("YYYY-MM-DD");
+      }
+
       if (mainStore.rowsAdd) {
         formData.persons = mainStore.rowsAdd;
       }