diff --git a/src/components/03_customer-management/ExpirationDate.vue b/src/components/03_customer-management/ExpirationDate.vue
index 2a56b82e..605d1f98 100644
--- a/src/components/03_customer-management/ExpirationDate.vue
+++ b/src/components/03_customer-management/ExpirationDate.vue
@@ -15,7 +15,14 @@ defineProps<{
     "
   >
     <q-badge
-      :color="calculateDaysUntilExpire(expirationDate) > 0 ? 'orange' : 'red'"
+      :color="
+        calculateDaysUntilExpire(expirationDate) > 90
+          ? 'green'
+          : calculateDaysUntilExpire(expirationDate) < 90 &&
+              calculateDaysUntilExpire(expirationDate) > 0
+            ? 'orange'
+            : 'red'
+      "
       class="text-weight-bold"
     >
       {{
diff --git a/src/pages/03_customer-management/BranchPage.vue b/src/pages/03_customer-management/BranchPage.vue
index d72dec1b..24affe7a 100644
--- a/src/pages/03_customer-management/BranchPage.vue
+++ b/src/pages/03_customer-management/BranchPage.vue
@@ -216,8 +216,12 @@ function openEmployerBranchForm(formType: 'create' | 'edit' | 'info') {
 async function fetchEmployee(opts: { branchId: string; pageSize?: number }) {
   const res = await fetchBranchEmployee(opts.branchId, {
     pageSize: opts.pageSize,
+    passport: true,
+    visa: true,
   });
 
+  console.log(res);
+
   if (res) {
     listEmployee.value = res.data.result;
   }
@@ -520,6 +524,8 @@ watch(
                     await fetchEmployee({
                       branchId: currentBranchEmployee,
                       pageSize: 999,
+                      passport: true,
+                      visa: true,
                     });
 
                     currentBtnOpen.map((v, i) => {
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 89dd8757..1f52279c 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1349,6 +1349,8 @@ const emptyCreateDialog = ref(false);
                                 const res = await employeeStore.fetchList({
                                   customerId: props.row.id,
                                   pageSize: 999,
+                                  passport: true,
+                                  visa: true,
                                 });
 
                                 if (res) {
diff --git a/src/stores/customer/index.ts b/src/stores/customer/index.ts
index 2ef12578..741d4578 100644
--- a/src/stores/customer/index.ts
+++ b/src/stores/customer/index.ts
@@ -60,6 +60,7 @@ const useCustomerStore = defineStore('api-customer', () => {
       page?: number;
       pageSize?: number;
       passport?: boolean;
+      visa?: boolean;
     },
   ) {
     const res = await api.get<Pagination<Employee[]>>(