diff --git a/Modules/Internal/Http/Controllers/Api/ClaimController.php b/Modules/Internal/Http/Controllers/Api/ClaimController.php index 20399516..d8d26202 100755 --- a/Modules/Internal/Http/Controllers/Api/ClaimController.php +++ b/Modules/Internal/Http/Controllers/Api/ClaimController.php @@ -179,7 +179,7 @@ class ClaimController extends Controller '), DB::raw(' (Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits - WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill + WHERE request_log_benefits.request_log_id = request_logs.id and deleted_by is null) AS tot_bill '), 'claim_requests.status_claim_management as status', ) @@ -537,7 +537,7 @@ class ClaimController extends Controller '), DB::raw(' (Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits - WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill + WHERE request_log_benefits.request_log_id = request_logs.id and deleted_by is null) AS tot_bill '), 'claim_requests.status_claim_management as status', ) diff --git a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php index 5338e478..dbd2d1c6 100755 --- a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php +++ b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php @@ -73,8 +73,8 @@ class ClaimRequestController extends Controller ->when($request->status, function($q, $status) { $q->where('status', $status); }) - ->paginate(); - + ->paginate(); + return Helper::paginateResources(ClaimRequestResource::collection($claimRequests)); } @@ -775,6 +775,7 @@ class ClaimRequestController extends Controller 'tot_billing' => function ($query) { $query->select(DB::raw('SUM(request_log_benefits.amount_approved)')) ->from('request_log_benefits') + ->whereNull('request_log_benefits.deleted_at') ->whereColumn('request_log_benefits.request_log_id', 'claim_requests.request_log_id') ->limit(1); }