diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index bbdabd87..b8a255df 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -313,14 +313,8 @@ class EmployeeController extends AdminController 'c.short_name', 'cb.branch_name', 'cp.id as client_policy_id', - '(SELECT COUNT(*) - FROM employees e - JOIN employee_polices ep ON e.id = ep.employee_id - WHERE e.file_id = files.id AND ep.client_policy_id = files.policy_id) as employee_count', - '(SELECT SUM(ep.rata_premimum) + SUM(ep.gst) - FROM employees e - JOIN employee_polices ep ON e.id = ep.employee_id - WHERE e.file_id = files.id AND ep.client_policy_id = files.policy_id) as total', + '"0" as employee_count', + '"0" as total', 'policy_type.policy_type' , 'cp.policy_no' , ]) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 2c23c619..c7dce21a 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -225,6 +225,7 @@ class EmployeePolicyModel extends Model public function getInceptionEmployeeDataForExportExcel($ref_data, $return_type = 0) { + $client_id = $ref_data['client_id']; $client_policy_id = $ref_data['client_policy_id']; $client_branch_id = $ref_data['client_branch_id']; $insurer_or_tpa = $ref_data['insurer_or_tpa']; @@ -314,6 +315,9 @@ class EmployeePolicyModel extends Model WHERE batch_files.event_type = '{$event}' AND batch_files.actions = 'export' AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}' + AND batch_files.client_policy_id = '{$client_policy_id}' + AND batch_files.client_policy_id = '{$client_id}' + ) as batch_data ON employee_polices.id = batch_data.emp_policy_id WHERE employee_polices.client_policy_id = '{$client_policy_id}' AND (employee_polices.{$id} IS NULL OR employee_polices.{$id} = '')