diff --git a/src/modules/05_leave/components/Forms/01_SickForm.vue b/src/modules/05_leave/components/Forms/01_SickForm.vue
index 03a5607..a8b0f4f 100644
--- a/src/modules/05_leave/components/Forms/01_SickForm.vue
+++ b/src/modules/05_leave/components/Forms/01_SickForm.vue
@@ -34,7 +34,7 @@ const formDataSick = reactive<any>({
 	leaveWrote: "",
 	leaveStartDate: null,
 	leaveEndDate: null,
-	halfDay: "day",
+	leaveRange: "ALL",
 	leaveTotal: "",
 	leaveLast: null,
 	leaveNumber: "",
@@ -47,7 +47,7 @@ const formDataSick = reactive<any>({
 const leaveWroteRef = ref<object | null>(null)
 const leaveStartDateRef = ref<object | null>(null)
 const leaveEndDateRef = ref<object | null>(null)
-const halfDayRef = ref<object | null>(null)
+const leaveRangeRef = ref<object | null>(null)
 const leaveTotalRef = ref<object | null>(null)
 const leaveLastRef = ref<object | null>(null)
 const leaveNumberRef = ref<object | null>(null)
@@ -59,7 +59,7 @@ const FormRef: FormRef = {
 	leaveWrote: leaveWroteRef,
 	leaveStartDate: leaveStartDateRef,
 	leaveEndDate: leaveEndDateRef,
-	halfDay: halfDayRef,
+	leaveRange: leaveRangeRef,
 	leaveTotal: leaveTotalRef,
 	leaveNumber: leaveNumberRef,
 	leaveAddress: leaveAddressRef,
@@ -92,7 +92,7 @@ async function fileUploadDoc(files: any) {
  * function รีเซทค่า leaveStartDate เเละ leaveEndDate
  */
 function resetDate() {
-	if (formDataSick.halfDay === "half_day_morning" || formDataSick.halfDay === "half_day_afternoon") {
+	if (formDataSick.leaveRange === "MORNING" || formDataSick.leaveRange === "AFTERNOON") {
 		formDataSick.leaveStartDate = null
 		formDataSick.leaveEndDate = null
 	}
@@ -147,6 +147,7 @@ async function saveFormData() {
 
 	formData.append("leaveDocument", formDataSick.leaveDocument)
 	formData.append("type", formDataSick.type)
+	formData.append("leaveRange", formDataSick.leaveRange)
 	formData.append("leaveStartDate", dateToISO(formDataSick.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataSick.leaveEndDate))
 	formData.append("leaveWrote", formDataSick.leaveWrote)
@@ -197,28 +198,27 @@ async function FetchCheck() {
  * ฟังก์ชั่นแปลงครึ่งวัน/ทั้งวัน
  */
 const isReadOnly = computed(() => {
-	const conditionHalfDay = formDataSick.halfDay === "half_day_morning" || formDataSick.halfDay === "half_day_afternoon"
-	if (conditionHalfDay) {
+	const conditionleaveRange = formDataSick.leaveRange === "MORNING" || formDataSick.leaveRange === "AFTERNOON"
+	if (conditionleaveRange) {
 		formDataSick.leaveEndDate = formDataSick.leaveStartDate // Set formDataSick.leaveEndDate to null
 		formDataSick.leaveTotal = 0.5
 	} else {
 		formDataSick.leaveTotal = null
 	}
-	return conditionHalfDay
+	return conditionleaveRange
 })
 
 function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
+	return {
+		"full-width cursor-pointer ": val,
+		"full-width cursor-pointer inputgreen": !val,
+	}
 }
 
-function resetEndDate(type:string){
-	if(type === 'day'){
+function resetEndDate(type: string) {
+	if (type === "day") {
 		formDataSick.EndLeaveDate === null
 	}
-
 }
 </script>
 
@@ -246,9 +246,9 @@ function resetEndDate(type:string){
 				/>
 
 				<div class="col-12 col-md-4 col-sm-12">
-					<q-radio v-model="formDataSick.halfDay" val="day" label="ลาทั้งวัน" checked-icon="task_alt" />
-					<q-radio v-model="formDataSick.halfDay" val="half_day_morning" label="ลาครึ่งวันเช้า" checked-icon="task_alt" @update:model-value="resetDate" />
-					<q-radio v-model="formDataSick.halfDay" val="half_day_afternoon" label="ลาครึ่งวันบ่าย" checked-icon="task_alt" @update:model-value="resetDate" />
+					<q-radio v-model="formDataSick.leaveRange" val="ALL" label="ลาทั้งวัน" checked-icon="task_alt" />
+					<q-radio v-model="formDataSick.leaveRange" val="MORNING" label="ลาครึ่งวันเช้า" checked-icon="task_alt" @update:model-value="resetDate" />
+					<q-radio v-model="formDataSick.leaveRange" val="AFTERNOON" label="ลาครึ่งวันบ่าย" checked-icon="task_alt" @update:model-value="resetDate" />
 				</div>
 				<div class="full-width">
 					<div class="q-col-gutter-sm row">
diff --git a/src/modules/05_leave/components/Forms/05_VacationForm.vue b/src/modules/05_leave/components/Forms/05_VacationForm.vue
index 3ea186c..6b677d4 100644
--- a/src/modules/05_leave/components/Forms/05_VacationForm.vue
+++ b/src/modules/05_leave/components/Forms/05_VacationForm.vue
@@ -32,7 +32,7 @@ const props = defineProps({
 const formDataVacation = reactive<any>({
 	type: dataStore.typeId,
 	leaveWrote: "",
-	halfDay: "day",
+	leaveRange: "ALL",
 	restDayOldTotal: "",
 	restDayCurrentTotal: "",
 	leaveStartDate: null,
@@ -48,7 +48,7 @@ const formDataVacation = reactive<any>({
 const leaveWroteRef = ref<object | null>(null)
 const restDayOldTotalRef = ref<object | null>(null)
 const restDayCurrentTotalRef = ref<object | null>(null)
-const halfDayRef = ref<object | null>(null)
+const leaveRangeRef = ref<object | null>(null)
 const leaveStartDateRef = ref<object | null>(null)
 const leaveEndDateRef = ref<object | null>(null)
 const leaveTotalRef = ref<object | null>(null)
@@ -60,7 +60,7 @@ const leaveDocumentRef = ref<object | null>(null)
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
 const FormRef: FormRef = {
 	leaveWrote: leaveWroteRef,
-	halfDay: halfDayRef,
+	leaveRange: leaveRangeRef,
 	restDayOldTotal: restDayOldTotalRef,
 	restDayCurrentTotal: restDayCurrentTotalRef,
 	leaveStartDate: leaveStartDateRef,
@@ -163,6 +163,7 @@ async function saveFormData() {
 	// }
 	formData.append("leaveDocument", formDataVacation.leaveDocument)
 	formData.append("type", formDataVacation.type)
+	formData.append("leaveRange", formDataVacation.leaveRange)
 	formData.append("leaveStartDate", dateToISO(formDataVacation.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataVacation.leaveEndDate))
 	formData.append("leaveWrote", formDataVacation.leaveWrote)
@@ -184,7 +185,7 @@ async function saveFormData() {
  * function รีเซทค่า leaveStartDate เเละ leaveEndDate
  */
 function resetDate() {
-	if (formDataVacation.halfDay === "half_day_morning" || formDataVacation.halfDay === "half_day_afternoon") {
+	if (formDataVacation.leaveRange === "MORNING" || formDataVacation.leaveRange === "AFTERNOON") {
 		formDataVacation.leaveStartDate = null
 		formDataVacation.leaveEndDate = null
 	}
@@ -193,14 +194,14 @@ function resetDate() {
 
 /** ฟังก์ชั่นแปลงค่า ครึ่งวัน/ทั้งวัน */
 const isReadOnly = computed(() => {
-	const conditionHalfDay = formDataVacation.halfDay === "half_day_morning" || formDataVacation.halfDay === "half_day_afternoon"
-	if (conditionHalfDay) {
+	const conditionleaveRange = formDataVacation.leaveRange === "MORNING" || formDataVacation.leaveRange === "AFTERNOON"
+	if (conditionleaveRange) {
 		formDataVacation.leaveEndDate = formDataVacation.leaveStartDate // Set formDataVacation.leaveEndDate to null
 		formDataVacation.leaveTotal = 0.5
 	} else {
 		formDataVacation.leaveTotal = null
 	}
-	return conditionHalfDay
+	return conditionleaveRange
 })
 </script>
 
@@ -226,9 +227,9 @@ const isReadOnly = computed(() => {
 					:rules="[val => !!val || `${'เขียนที่'}`]"
 				/>
 				<div class="col-12 col-md-4 col-sm-6">
-					<q-radio v-model="formDataVacation.halfDay" val="day" label="ลาทั้งวัน" checked-icon="task_alt" />
-					<q-radio v-model="formDataVacation.halfDay" val="half_day_morning" label="ลาครึ่งวันเช้า" checked-icon="task_alt" @update:model-value="resetDate" />
-					<q-radio v-model="formDataVacation.halfDay" val="half_day_afternoon" label="ลาครึ่งวันบ่าย" checked-icon="task_alt" @update:model-value="resetDate" />
+					<q-radio v-model="formDataVacation.leaveRange" val="ALL" label="ลาทั้งวัน" checked-icon="task_alt" />
+					<q-radio v-model="formDataVacation.leaveRange" val="MORNING" label="ลาครึ่งวันเช้า" checked-icon="task_alt" @update:model-value="resetDate" />
+					<q-radio v-model="formDataVacation.leaveRange" val="AFTERNOON" label="ลาครึ่งวันบ่าย" checked-icon="task_alt" @update:model-value="resetDate" />
 				</div>
 				<q-input
 					class="col-12 col-md-4 col-sm-6"
diff --git a/src/modules/05_leave/interface/request/SickForm.ts b/src/modules/05_leave/interface/request/SickForm.ts
index e3573be..b14fd9e 100644
--- a/src/modules/05_leave/interface/request/SickForm.ts
+++ b/src/modules/05_leave/interface/request/SickForm.ts
@@ -2,7 +2,7 @@ interface FormData {
 	leaveWrote: string //เขียนที่***
 	leaveStartDate: Date | null //*วัน เดือน ปีเริ่มต้นลา
 	leaveEndDate: Date | null //*วัน เดือน ปีสิ้นสุดลา
-	halfDay: string
+	leaveRange: string
 	leaveTotal: string //จำนวนวันลา
 	contractTel: string //หมายเลขโทรศัพท์ที่ติดต่อได้
 	leaveNumber: string //หมายเลขที่ติดต่อขณะลา
@@ -16,7 +16,7 @@ interface FormRef {
 	leaveWrote: object | null //เขียนที่***
 	leaveStartDate: object | null //*วัน เดือน ปีเริ่มต้นลา
 	leaveEndDate: object | null //*วัน เดือน ปีสิ้นสุดลา
-	halfDay: object | null
+	leaveRange: object | null
 	leaveTotal: object | null //จำนวนวันลา
 	leaveNumber: object | null //หมายเลขที่ติดต่อขณะลา
 	leaveDetail: object | null //รายละเอียดการลา
diff --git a/src/modules/05_leave/interface/request/VacationForm.ts b/src/modules/05_leave/interface/request/VacationForm.ts
index 58212a5..db3fe5d 100644
--- a/src/modules/05_leave/interface/request/VacationForm.ts
+++ b/src/modules/05_leave/interface/request/VacationForm.ts
@@ -1,6 +1,6 @@
 interface FormData {
 	leaveWrote: string //เขียนที่***
-	halfDay: string
+	leaveRange: string
 	restDayOldTotal: string //จำนวนวันลาพักผ่อนสะสม จากปีที่ผ่านมา
 	restDayCurrentTotal: string //จำนวนวันลาพักผ่อนประจำปีปัจจุบัน
 	leaveStartDate: Date | null //*วัน เดือน ปีเริ่มต้นลา
@@ -15,7 +15,7 @@ interface FormData {
 
 interface FormRef {
 	leaveWrote: object | null //เขียนที่***
-	halfDay: object | null
+	leaveRange: object | null
 	leaveStartDate: object | null //*วัน เดือน ปีเริ่มต้นลา
 	restDayOldTotal: object | null //ชื่อภรรยา
 	restDayCurrentTotal: object | null //วันที่คลอด