diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue
index 08aba27..8eb1073 100644
--- a/src/modules/05_leave/components/ListView.vue
+++ b/src/modules/05_leave/components/ListView.vue
@@ -158,12 +158,28 @@ async function updatePagination(p: number, ps: number) {
   await fetchDataTable();
 }
 
+function convert(val: any) {
+  if (leaveType.value) {
+    const filtertype = leaveType.value.find(
+      (e: any) => e.id === val.leaveTypeId
+    );
+    const type = filtertype?.code;
+    if (type == "LV-006" && val.hajjDayStatus == false) {
+      return "ลาอุปสมบท";
+    } else if (type == "LV-006" && val.hajjDayStatus == true) {
+      return "ลาประกอบพิธีฮัจญ์";
+    } else {
+      return val.leaveTypeName;
+    }
+  }
+}
+
 /**
  * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้
  */
 onMounted(async () => {
-  await fetchDataTable();
   await fectOptionType();
+  await fetchDataTable();
 });
 </script>
 <template>
@@ -195,7 +211,7 @@ onMounted(async () => {
           :props="props"
           @click="onClickView(props.row.id, props.row.status)"
         >
-          {{ props.row.leaveTypeName }}
+          {{ convert(props.row) }}
         </q-td>
         <q-td
           key="dateLeave"
diff --git a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
index 1e6b714..f1aa069 100644
--- a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
@@ -18,7 +18,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">{{ props.data.leaveTypeName }}</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/07_HajjForm.vue b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
index 60cf162..c6054b3 100644
--- a/src/modules/05_leave/components/formDetail/07_HajjForm.vue
+++ b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
@@ -18,7 +18,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">{{ props.data.leaveTypeName }}</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/interface/response/leave.ts b/src/modules/05_leave/interface/response/leave.ts
index 3f4a2a4..c86341d 100644
--- a/src/modules/05_leave/interface/response/leave.ts
+++ b/src/modules/05_leave/interface/response/leave.ts
@@ -8,6 +8,7 @@ interface ListLeave {
 	dateSendLeave: Date | null //วันที่ยื่นใบลา
 	status: string //สถานะการของลา
 	isDelete: boolean //ขอยกเลิกคำขอลา ถ้าเคยขอแล้วจะเป็น true ไม่เคยเป็น false
+	hajjDayStatus: boolean
 }
 
 interface ListLeaveTable {
@@ -18,6 +19,7 @@ interface ListLeaveTable {
 	dateSendLeave: string | null
 	status: string
 	isDelete: boolean
+	hajjDayStatus: boolean
 }
 
 interface FremDetail {
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index 8ee99f6..58c6d4f 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -35,6 +35,7 @@ export const useLeaveStore = defineStore("Leave", () => {
 			dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
 			dateLeave: date2Thai(e.leaveStartDate) + " - " + date2Thai(e.leaveEndDate),
 			status: e.status,
+			hajjDayStatus: e.hajjDayStatus,
 			statusConvert: convertStatud(e.status),
 			isDelete: e.isDelete,
 		}))