diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index af9c2f07..39e1f7af 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2199,9 +2199,11 @@ class EmployeeRestController extends AdminController
 
     function getEmployeeActiveOrInactivePolicy()
     {
-    if($this->request->getGet('type') == 'Active'){ $policy_status = 1; }else{ $policy_status = 0; }
-        $ClientPolicyData =  $this->clientPolicyModel->select('client_policy.* , policies.name as policy_name , policy_type.policy_type as policy_type')
-                                                    ->join('policies', 'client_policy.policy_id = policies.id', 'left')
+        if($this->request->getGet('type') == 'Active'){ $policy_status = 1; }else{ $policy_status = 0; }
+        $ClientPolicyData =  $this->clientPolicyModel->select('client_policy.* , policy_type.policy_type as policy_type,insurers.name as insurer_name,tpa.name as tpa_name')
+                                                    
+                                                    ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
+                                                    ->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
                                                     ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
                                                     ->where('client_policy.client_id', $this->request->getGet('client_id') )
                                                     ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id') )
@@ -2209,7 +2211,7 @@ class EmployeeRestController extends AdminController
                                                     ->where('client_policy.policy_status', $policy_status)
                                                     ->orderby('client_policy.id' , 'ASC')
                                                     ->findAll();
-
+// dd($ClientPolicyData);
         // Retrieve employee and dependents data by passing the employee code
         $employeeData = $this->employeeModel->where('emp_code',$this->request->getGet('emp_code'))
                                             ->where('client_id',$this->request->getGet('client_id'))
@@ -2232,15 +2234,22 @@ class EmployeeRestController extends AdminController
 
                 $terms = json_decode($ClientPolicyValue['policy_terms']);
 
-                if($ClientPolicyValue['policy_type_id'] == 1){ $data['policy_terms'] =  $this->policyTermsFiter($terms,'gpa'); }
-                else{ $data['policy_terms'] =  $this->policyTermsFiter($terms,'gmc'); }
+                if($ClientPolicyValue['policy_type_id'] == 1)
+                { 
+                    $data['policy_terms'] =  $this->policyTermsFiter($terms,'gpa'); 
+                    $data['department_id'] = 3;
+                }else{ 
+                    $data['policy_terms'] =  $this->policyTermsFiter($terms,'gmc'); 
+                    $data['department_id'] = 4;
+                }
             
                 $data['client_id'] = $ClientPolicyValue['client_id'];
                 $data['client_policy_id'] = $ClientPolicyValue['id'];
-                $data['policy_name'] = $ClientPolicyValue['policy_name'];
-                $data['policy_type'] = $ClientPolicyValue['policy_type'];
+                $data['policy_name'] = $ClientPolicyValue['policy_type'];
                 $data['policy_type'] = $ClientPolicyValue['policy_type'];
                 $data['policy_no'] = $ClientPolicyValue['policy_no'];
+                $data['insurer_name'] = $ClientPolicyValue['insurer_name'];
+                $data['tpa_name'] = $ClientPolicyValue['tpa_name'];
                 $data['policy_start_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['policy_start_date']);
                 $data['policy_end_date'] = $this->convertDateFormatDisplay($ClientPolicyValue['policy_end_date']);
                 // $data['policy_terms'] = $terms;
@@ -2482,7 +2491,7 @@ class EmployeeRestController extends AdminController
 
     public function sendPushNotification()
     {
-        $deviceToken = 'ffvc39yhRk-J-vGE9luw6l:APA91bFgNv7lzvA3lGuJ_pMDHdZ_rey6SMg11P2DvJk-WWiBs0nXWCF0lo5nEka3dn3DeTCS5yx0WrHs1yKj5faitBQYKeKxLg2VpUkDcmk3FrTDGkZdHcnW1Go0G0K8dYAkajRIjSEJ';
+        $deviceToken = 'cMVKESh8QzqIl8nh_yqbcl:APA91bHKm87Sh1goVJNKZtctV4etgLMQboI0eyDVn3MH1yf9cO-2RtQRlFnKLdataOxosoxm7a4JvATKjfI1_Bids46mGw5m8zesp90mR4odCbD_cJtGmBeMYt4hssSY0YtAht1emK_H';
         $title = 'Nhance';
         $body = 'All your policy enrolled successfully ..!';