diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index 75d7c03b..de8a6a0c 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted, watch, computed } from 'vue';
-import useUtilsStore, { dialog, calculateAge } from 'src/stores/utils';
+import useUtilsStore, { dialog } from 'src/stores/utils';
+import { calculateAge } from 'src/utils/datetime';
 import type { QTableProps } from 'quasar';
 import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index bf10dee7..e55216d0 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -59,7 +59,8 @@ import FormEmployeeWorkHistory from 'src/components/03_customer-management/FormE
 import FormEmployeeOther from 'src/components/03_customer-management/FormEmployeeOther.vue';
 import FormEmployeePassport from 'src/components/03_customer-management/FormEmployeePassport.vue';
 import FormEmployeeVisa from 'src/components/03_customer-management/FormEmployeeVisa.vue';
-import useUtilsStore, { dialog, calculateAge } from 'src/stores/utils';
+import useUtilsStore, { dialog } from 'src/stores/utils';
+import { calculateAge } from 'src/utils/datetime';
 import { useI18n } from 'vue-i18n';
 import useFlowStore from 'src/stores/flow';
 
@@ -2416,7 +2417,7 @@ watch([inputSearch, currentStatus], async () => {
                         <q-td
                           v-if="fieldSelected.includes('formDialogInputAge')"
                         >
-                          {{ userStore.calculateAge(props.row.dateOfBirth) }}
+                          {{ calculateAge(props.row.dateOfBirth) }}
                         </q-td>
 
                         <q-td
@@ -2597,9 +2598,7 @@ watch([inputSearch, currentStatus], async () => {
                               {
                                 icon: 'mdi-clock-outline',
                                 value: props.row.dateOfBirth
-                                  ? userStore.calculateAge(
-                                      props.row.dateOfBirth,
-                                    ) ?? ''
+                                  ? calculateAge(props.row.dateOfBirth) ?? ''
                                   : '',
                               },
                             ],
diff --git a/src/stores/user/index.ts b/src/stores/user/index.ts
index 62d38d4d..418b12e7 100644
--- a/src/stores/user/index.ts
+++ b/src/stores/user/index.ts
@@ -69,25 +69,6 @@ const useUserStore = defineStore('api-user', () => {
   });
 
   const data = ref<Pagination<User[]>>();
-  const { locale } = useI18n();
-
-  function calculateAge(birthDate: Date | null | string) {
-    if (!birthDate) return null;
-    const birthDateTimeStamp = new Date(birthDate).getTime();
-    const now = new Date();
-    const diff = now.getTime() - birthDateTimeStamp;
-
-    const ageDate = new Date(diff);
-    const years = ageDate.getUTCFullYear() - 1970;
-    const months = ageDate.getUTCMonth();
-    const days = ageDate.getUTCDate() - 1;
-
-    if (locale.value === 'th-th') {
-      return `${years} ปี ${months !== 0 ? months + ' เดือน' : ''}  ${days !== 0 ? days + ' วัน' : ''} `;
-    } else {
-      return `${years} years ${months !== 0 ? months + ' months' : ''}  ${days !== 0 ? days + ' days' : ''} `;
-    }
-  }
 
   async function fetchHqOption() {
     if (userOption.value.hqOpts.length === 0) {
@@ -493,7 +474,6 @@ const useUserStore = defineStore('api-user', () => {
   return {
     data,
     userOption,
-    calculateAge,
 
     fetchHqOption,
     fetchBrOption,
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index d0484eda..f2b6f541 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -44,26 +44,6 @@ export function dialogWarningClose(
   });
 }
 
-export function calculateAge(birthDate: Date | null | string) {
-  const { locale } = useI18n();
-
-  if (!birthDate) return null;
-  const birthDateTimeStamp = new Date(birthDate).getTime();
-  const now = new Date();
-  const diff = now.getTime() - birthDateTimeStamp;
-
-  const ageDate = new Date(diff);
-  const years = ageDate.getUTCFullYear() - 1970;
-  const months = ageDate.getUTCMonth();
-  const days = ageDate.getUTCDate() - 1;
-
-  if (locale.value === 'th-th') {
-    return `${years} ปี ${months !== 0 ? months + ' เดือน' : ''}  ${days !== 0 ? days + ' วัน' : ''} `;
-  } else {
-    return `${years} years ${months !== 0 ? months + ' months' : ''}  ${days !== 0 ? days + ' days' : ''} `;
-  }
-}
-
 export function moveItemUp(items: unknown[], index: number) {
   if (index > 0) {
     const temp = items[index];