diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index f53e2808..1a66028d 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -69,9 +69,11 @@ class EmployeeRestController extends AdminController
     {
        try {
             $emp_code = $this->request->getGet('emp_code');
+            $client_id = $this->request->getGet('client_id');
             if ($emp_code) {
                 $relationship = 'self';
                 $employee = $this->employeeModel->where('emp_code', $emp_code)
+                                                ->where('client_id', $client_id)
                                                 ->where('is_active', 1 )
                                                 ->where('relationship', $relationship)
                                                 ->first();
@@ -211,7 +213,7 @@ class EmployeeRestController extends AdminController
                     {
                        $this->createEmployeePolicyData($employee , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id);
                     }else{
-                       $this->createEmployeePolicyData($employee , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si);
+                       $this->createEmployeePolicyData($data[0]->id , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si);
                     }
 
 
@@ -1446,11 +1448,14 @@ public function getAddOnPolicy()
 public function iAgreeForAddOn()
 { 
 
-    $emp_code = $this->request->getPost('emp_code');
+   
     $postData = json_decode($this->request->getBody(), true);
     $client_policy_id = $postData['client_policy_id'];
+    $emp_code = $postData['emp_code'];
+    $client_id = $postData['client_id'];
 
     $this->employeeModel->where('emp_code', $emp_code )
+                        ->where('client_id', $client_id )
                         ->where('is_active', 1 )
                         ->set(array('emp_status'=>'enrolled'))
                         ->update();
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 25a70785..1e98e9fb 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -571,7 +571,8 @@ if (!function_exists('calculate_premimum'))
                     $transformed_familiy_member_data['temp']['band'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band'];
                     $transformed_familiy_member_data['temp']['maxage'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxage'];
                     $transformed_familiy_member_data['temp']['maxcount'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxcount'];
-                     $transformed_familiy_member_data['policy_details']['basic_cover_si'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si'];
+                     
+                     $transformed_familiy_member_data['policy_details']['basic_cover_si'] = isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']) ? $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']  : $transformed_familiy_member_data['policy_details']['basic_cover_si'];
 
                     if( $fileArr['id'] == null || (in_array($grid_type,[10,11]) ||  $transformed_familiy_member_data['temp']['source'] == 'excel'))//if file id is null then data coming from enrollment (from DB) otherwise data coming from xcel, so calculate only data from excel (new entry) note: even data coming from excel for event dependet additon we fetch other dependts from db and calculate premium for whole family
                     {
@@ -860,7 +861,7 @@ if (!function_exists('premium_calculation_manager'))
                 foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
                 {
                    
-                    if($slab_value['grade'] == $employee_received_band && $slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
                         $emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']);