diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index d5b9abae..fed297e5 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2833,17 +2833,24 @@ class EmployeeRestController extends AdminController
             
             if(!empty($receviedPayload['mobile_no']) || !empty($receviedPayload['email_id'])){
                 
-                $retailUserData['id'] = null;
-                $retailUserData['mobile'] = $receviedPayload['mobile_no'];
-                $retailUserData['email_id'] = $receviedPayload['email_id'];
-                $emp_reatail_policy_data = $this->getEmpRetailPolicy($retailUserData);
+                $retailUserData = (object) [
+                    'id'        => null,
+                    'mobile'    => $receviedPayload['mobile_no'],
+                    'email_id'  => $receviedPayload['email_id']
+                ];
 
-                $query = $this->clientModel->where('is_active', 1)->where('client_type', 2);
-                if(!empty($receviedPayload['mobile_no'])){
+                $emp_reatail_policy_data = $this->getEmpRetailPolicy($retailUserData);
+                
+                $query = $this->clientModel
+                                ->where('is_active', 1)
+                                ->where('client_type', 2);
+
+                if (!empty($receviedPayload['mobile_no'])) {
                     $query->where('phone', $receviedPayload['mobile_no']);
-                }else {
-                    $query->where('email', $receviedPayload['email_id']);
-                };
+                } else {
+                    $query->where('email', $receviedPayload['email_id'] ?? null);
+                }
+
                 $retailClientData = $query->first();
 
                 return $this->respond(['status' => 'success', 'code' => 200, 'data' => [], 'emp_name' => $retailClientData['client_name'] ?? "", 'pre_policy_count' => 0, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => []], 200);
@@ -4708,7 +4715,7 @@ class EmployeeRestController extends AdminController
             if (!empty($mobile_number)) {
                 $emp_retail_client_data = $this->clientModel
                     ->select("
-                        $emp_id as emp_id,
+                        '{$emp_id}' AS emp_id,
                         policy_transaction.insurer_id,
                         policy_transaction.policy_type_id,
                         policy_transaction.policy_no,
@@ -4729,7 +4736,7 @@ class EmployeeRestController extends AdminController
             }else {
                 $emp_retail_client_data = $this->clientModel
                     ->select("
-                        $emp_id as emp_id,
+                        '{$emp_id}' AS emp_id,
                         policy_transaction.insurer_id,
                         policy_transaction.policy_type_id,
                         policy_transaction.policy_no,
@@ -4745,11 +4752,12 @@ class EmployeeRestController extends AdminController
                     ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id')
                     ->where('policy_transaction.is_active', 1)
                     ->where('clients.is_active', 1)
+                    ->where('clients.email IS NOT NULL')
                     ->where('clients.email', $email_id)
                     ->findAll();
             }
 
-            // print_r($emp_retail_policy_data); die;
+            // print_r($this->clientModel->getLastQuery()); die;
 
             $complete_emp_retail_policy_data = array_values(
                 array_column(