diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 3d26510..1a37468 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -310,12 +310,13 @@ function checkLeaveType(leaveTypeId: string) {
       checkForm.value = "FormCheckSelect";
     } else if (
       type === "LV-008" &&
-      formData.leaveSubTypeName === "ลาไปศึกษาต่อ"
+      formData.leaveSubTypeName === "ศึกษาต่อ"
     ) {
       checkForm.value = "FormStudy";
     } else if (
-      type === "LV-008" &&
-      formData.leaveSubTypeName === "ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน"
+      (type === "LV-008" && formData.leaveSubTypeName === "ฝึกอบรม") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ปฎิบัติการวิจัย") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ดูงาน")
     ) {
       checkForm.value = "FormLeaveToTraining";
     } else if (type === "LV-009") {
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index edfdff6..912597c 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -161,8 +161,8 @@ async function fetchCheck() {
       isLeave.value = data.isLeave;
       formDataHaji.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataHaji.leaveStartDate,
-        formDataHaji.leaveEndDate
+        convertDateToAPI(formDataHaji.leaveStartDate),
+        convertDateToAPI(formDataHaji.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index 6fe3ded..ba7af1b 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -184,8 +184,8 @@ async function fetchCheck() {
       isLeave.value = data.isLeave;
       formDataMilitary.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataMilitary.leaveStartDate,
-        formDataMilitary.leaveEndDate
+        convertDateToAPI(formDataMilitary.leaveStartDate),
+        convertDateToAPI(formDataMilitary.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
index 4abf949..0b3fc74 100644
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@@ -199,8 +199,8 @@ async function fetchCheck() {
       isLeave.value = data.isLeave;
       formDataStudy.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataStudy.leaveStartDate,
-        formDataStudy.leaveEndDate
+        convertDateToAPI(formDataStudy.leaveStartDate),
+        convertDateToAPI(formDataStudy.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
index 46eec3c..4b71237 100644
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@@ -184,8 +184,8 @@ async function fetchCheck() {
       isLeave.value = data.isLeave;
       formDataTrain.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataTrain.leaveStartDate,
-        formDataTrain.leaveEndDate
+        convertDateToAPI(formDataTrain.leaveStartDate),
+        convertDateToAPI(formDataTrain.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
index 682e0d3..6d2bc34 100644
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@@ -190,8 +190,8 @@ async function fetchCheck() {
       formDataWorkInternational.leaveTotal = data.totalDate;
 
       leaveText.value = calculateDurationYmd(
-        formDataWorkInternational.leaveStartDate,
-        formDataWorkInternational.leaveEndDate
+        convertDateToAPI(formDataWorkInternational.leaveStartDate),
+        convertDateToAPI(formDataWorkInternational.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index 0328139..141c2a8 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -220,10 +220,10 @@ async function fetchCheck() {
     .then((res: any) => {
       const data = res.data.result;
       isLeave.value = data.isLeave;
-      formDataFollowSpouse.leaveTotalDay = data.totalDate;
+      formDataFollowSpouse.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataFollowSpouse.leaveStartDate,
-        formDataFollowSpouse.leaveEndDate
+        convertDateToAPI(formDataFollowSpouse.leaveStartDate),
+        convertDateToAPI(formDataFollowSpouse.leaveEndDate)
       );
       reasonLeave.value = data.message
         ? data.message
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 4bf8adb..6e08aab 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -148,8 +148,8 @@ async function fetchCheck() {
       isLeave.value = data.isLeave;
       formDataRehabilitation.leaveTotal = data.totalDate;
       leaveText.value = calculateDurationYmd(
-        formDataRehabilitation.leaveStartDate,
-        formDataRehabilitation.leaveEndDate
+        convertDateToAPI(formDataRehabilitation.leaveStartDate),
+        convertDateToAPI(formDataRehabilitation.leaveEndDate)
       );
 
       reasonLeave.value = data.message
diff --git a/src/modules/05_leave/components/formDetail/09_StudyForm.vue b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
index 3f2cdb4..3a6c7af 100644
--- a/src/modules/05_leave/components/formDetail/09_StudyForm.vue
+++ b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
@@ -22,7 +22,7 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
-      <div class="col-xs-12 col-md-6">ลาไปศึกษาต่อ</div>
+      <div class="col-xs-12 col-md-6">ศึกษาต่อ</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>
diff --git a/src/modules/05_leave/components/formDetail/10_TrainForm.vue b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
index 5096c27..e9ea16d 100644
--- a/src/modules/05_leave/components/formDetail/10_TrainForm.vue
+++ b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useLeaveStore } from '@/modules/05_leave/store'
+import { useLeaveStore } from "@/modules/05_leave/store";
 
-const store = useLeaveStore()
-const { converstType } = store
+const store = useLeaveStore();
+const { converstType } = store;
 /**
  * รับ prop จาก component
  */
@@ -21,7 +21,7 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
-      <div class="col-xs-12 col-md-6">ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.leaveSubTypeName }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>
@@ -29,11 +29,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index d280ef1..638de68 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -184,8 +184,10 @@ export const useLeaveStore = defineStore("Leave", () => {
   }
   /** รายการประเภทการลาของ ลาไปศึกษา ฝึกอบรม ปฎิบัติการวิจัย หรือดูงาน*/
   const optionsSpecific = ref<string[]>([
-    "ลาไปศึกษาต่อ",
-    "ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน",
+    "ศึกษาต่อ",
+    "ฝึกอบรม",
+    "ปฎิบัติการวิจัย",
+    "ดูงาน",
   ]);
 
   /** รายการประเภทการลาของ ลาอุปสมบทหรือลาประกอบพิธีฮัจญ์*/
diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue
index 6688e3e..76f6dc0 100644
--- a/src/modules/05_leave/views/AddPage.vue
+++ b/src/modules/05_leave/views/AddPage.vue
@@ -235,14 +235,15 @@ onMounted(async () => {
                 :on-submit="onSubmit"
               />
               <StudyForm
-                v-if="model === 'LV-008' && modelSpecific === 'ลาไปศึกษาต่อ'"
+                v-if="model === 'LV-008' && modelSpecific === 'ศึกษาต่อ'"
                 style="width: 100%"
                 :on-submit="onSubmit"
               />
               <TrainForm
                 v-if="
-                  model === 'LV-008' &&
-                  modelSpecific == 'ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน'
+                  (model === 'LV-008' && modelSpecific == 'ฝึกอบรม') ||
+                  (model === 'LV-008' && modelSpecific == 'ปฎิบัติการวิจัย') ||
+                  (model === 'LV-008' && modelSpecific == 'ดูงาน')
                 "
                 :on-submit="onSubmit"
               />
diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue
index 73a5005..6f2c64a 100644
--- a/src/modules/05_leave/views/EditPage.vue
+++ b/src/modules/05_leave/views/EditPage.vue
@@ -465,7 +465,7 @@ onMounted(async () => {
                 :click-delete="clickDelete"
               />
               <StudyForm
-                v-if="model === 'LV-008' && modelSpecific === 'ลาไปศึกษาต่อ'"
+                v-if="model === 'LV-008' && modelSpecific === 'ศึกษาต่อ'"
                 style="width: 100%"
                 :data="formData"
                 :on-submit="onSubmit"
@@ -474,8 +474,9 @@ onMounted(async () => {
               />
               <TrainForm
                 v-if="
-                  model === 'LV-008' &&
-                  modelSpecific == 'ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน'
+                  (model === 'LV-008' && modelSpecific == 'ฝึกอบรม') ||
+                  (model === 'LV-008' && modelSpecific == 'ปฎิบัติการวิจัย') ||
+                  (model === 'LV-008' && modelSpecific == 'ดูงาน')
                 "
                 :data="formData"
                 :on-submit="onSubmit"