diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php
index 061dbddd..fefb1a9c 100644
--- a/Modules/Client/Http/Controllers/Api/ClaimController.php
+++ b/Modules/Client/Http/Controllers/Api/ClaimController.php
@@ -364,7 +364,7 @@ class ClaimController extends Controller
                 ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
                 ->where('organizations.id', '=', $item->organization_id)
                 ->where('addresses.addressable_type', '=', 'App\Models\Organization')
-                ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
+                ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit', 'organizations.corporate_id_partner')
                 ->first();
                 //Data Member
                 $dataMember = DB::table('members')
@@ -380,9 +380,9 @@ class ClaimController extends Controller
                     DB::raw('
                         (Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik
                     '),
-                    DB::raw('
-                        "LinkSehat" AS penjamin
-                    '),
+                    // DB::raw('
+                    //     "LinkSehat" AS penjamin
+                    // '),
                     DB::raw('
                         (Select corporates.name FROM corporates
                             LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
@@ -426,6 +426,18 @@ class ClaimController extends Controller
                     )
                 ->first();
 
+                //get penjamin
+                $penjamin = 'LinkSehat';
+                if(!empty($dataRumahSakit->corporate_id_partner))
+                {
+                    $corporate_id_partners = explode(',', $dataRumahSakit->corporate_id_partner);
+                    $valueToCheck = $dataMember->id_perusahaan;
+
+                    if (in_array($valueToCheck, $corporate_id_partners)) {
+                        $penjamin = $dataMember->nama_perusahaan;
+                    }
+                }
+
                 //Nama Karyawan
                 $data['namaKaryawan'] = '';
                 if($dataMember->principal_id)
@@ -480,7 +492,7 @@ class ClaimController extends Controller
                             !empty($dataMember->name) ? $dataMember->name : '',
                             $data['namaKaryawan'],
                             !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
-                            'LinkSehat',
+                            $penjamin,
                             !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                             !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
                             ($firtIndex == $index ? $item->tot_bill : ''),
@@ -513,7 +525,7 @@ class ClaimController extends Controller
                         !empty($dataMember->name) ? $dataMember->name : '',
                         $data['namaKaryawan'],
                         !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
-                        'LinkSehat',
+                        $penjamin,
                         !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                         !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
                         '',
diff --git a/frontend/client-portal/src/pages/AlarmCenter/List.tsx b/frontend/client-portal/src/pages/AlarmCenter/List.tsx
index a2c9e7f3..ecc8b454 100644
--- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx
+++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx
@@ -298,26 +298,26 @@ export default function List() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
-          start_date: <Label>{obj.start_date ? fDateSuffix(obj.start_date) : '-'}</Label>,
-          end_date: <Label> {obj.end_date ? fDateSuffix(obj.end_date) : '-'}</Label>,
+          start_date: obj.start_date && obj.start_date != '0000-00-00' ? <Label>{fDateSuffix(obj.start_date)}</Label> : '-',
+          end_date: obj.end_date && obj.end_date != '0000-00-00' ? <Label>{fDateSuffix(obj.end_date)}</Label> : '-',
           action: (
             <TableMoreMenu
-            actions={
+              actions={
                 <>
-                    <MenuItem onClick={() => navigate('member/' + obj.id)}>
-                        <VisibilityOutlinedIcon />
-                        View
-                    </MenuItem>
-                    <MenuItem onClick={() => handleDocumentClick(obj.link_document)}>
-                        <Download />
-                        Document Member
-                    </MenuItem>
+                  <MenuItem onClick={() => navigate('member/' + obj.id)}>
+                    <VisibilityOutlinedIcon />
+                    View
+                  </MenuItem>
+                  <MenuItem onClick={() => handleDocumentClick(obj.link_document)}>
+                    <Download />
+                    Document Member
+                  </MenuItem>
                 </>
-            }
+              }
             />
-        
           ),
         }))
+        
       );
 
       setPaginationTable(response.data);