diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php
index fd7d741d..7ba99da8 100644
--- a/app/Services/CorporateMemberService.php
+++ b/app/Services/CorporateMemberService.php
@@ -148,8 +148,8 @@ class CorporateMemberService
     public function getAllMemberAlarmCenter(int $corporateId, Request $request)
     {
         $limit = $request->has('perPage') ? $request->input('perPage') : 10;
-        $start_date = date('Y-m-d', strtotime($request->input('start_date') . ' +1 day'));
-        $end_date = date('Y-m-d', strtotime($request->input('end_date') . ' +1 day'));
+        // $start_date = date('Y-m-d', strtotime($request->input('start_date') . ' +1 day'));
+        // $end_date = date('Y-m-d', strtotime($request->input('end_date') . ' +1 day'));
 
         // dd($request);
         return Member::query()
@@ -164,11 +164,11 @@ class CorporateMemberService
                         ->orWhere('members.name', 'like', "%" . $search . "%");
                 });
             })
-            ->when($request->input('start_date'), function (Builder $query, $start) {
-                $query->where('members.members_effective_date', '>=', $start);
+            ->when($request->input('start_date'), function (Builder $query, $start_date) {
+                $query->where('members.members_effective_date', '>=', $start_date);
             })
-            ->when($request->input('end_date'), function (Builder $query, $end) {
-                $query->where('members.members_expire_date', '<', $end);
+            ->when($request->input('end_date'), function (Builder $query, $end_date) {
+                $query->where('members.members_expire_date', '<', $end_date);
             })
             ->when($request->input('division'), function (Builder $query, $value) {
                 $query->where('corporate_employees.division_id', $value);
@@ -181,8 +181,8 @@ class CorporateMemberService
                     'memberId' => 'member_id',
                     'fullName' => 'name',
                     // 'status' => 'active',
-                    'start_date' => 'member_plans.start',
-                    'end_date' => 'member_plans.end',
+                    'start_date' => 'member_plans.members_effective_date',
+                    'end_date' => 'member_plans.members_expire_date',
                         // 'service' => 'plans.service_code',
 
                     default => ''
diff --git a/frontend/client-portal/src/layouts/dashboard/header/CorporatePopover.tsx b/frontend/client-portal/src/layouts/dashboard/header/CorporatePopover.tsx
index 0f60066e..de3fd2ef 100644
--- a/frontend/client-portal/src/layouts/dashboard/header/CorporatePopover.tsx
+++ b/frontend/client-portal/src/layouts/dashboard/header/CorporatePopover.tsx
@@ -35,7 +35,13 @@ export default function CorporatePopover() {
         });
         setCorporateData(corporateManages.data);
 
-        setCorporateValue(corporateManages.data[0].id);
+        const storageCorporateValue = corporateManages.data.find(
+          (item: { id: number }) => item.id === parseInt(corporateValue)
+        );
+
+        setCorporateValue(
+          storageCorporateValue ? storageCorporateValue.id : corporateManages.data[0].id
+        );
       } catch (error: any) {
         console.error('Error fetching data:', error.message);
       }