diff --git a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php index eec5be19..2b9a2e75 100644 --- a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php +++ b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php @@ -59,7 +59,7 @@ class ClaimRequestController extends Controller $q->where('submission_date', '<', Carbon::parse($endDate)->addDay()); } }) - + ->when($request->service_code, function ($q, $serviceCode) { $q->whereIn('service_code', $serviceCode); }) @@ -76,7 +76,7 @@ class ClaimRequestController extends Controller }) ->with(['member', 'files', 'service', 'member.currentPolicy']) ->paginate(); - + return Helper::paginateResources(ClaimRequestResource::collection($claimRequests)); } @@ -443,7 +443,7 @@ class ClaimRequestController extends Controller $import = new ImportService(); $import->read($fileRead); $import->write($fileWrite, 'xsls'); - + foreach ($import->sheetsIterator() as $sheetIndex => $sheet) { if ($sheetIndex == 1) { // Rename First Sheet to Writer $firstWriterSheet = $import->writer->getCurrentSheet(); @@ -524,7 +524,7 @@ class ClaimRequestController extends Controller Storage::delete('temp/' . $file_name); $import->writer->close(); return [ - + 'result_file' => [ 'url' => Storage::disk('public')->url('temp/result-' . $file_name), 'name' => 'result-' . $file_name, @@ -603,7 +603,7 @@ class ClaimRequestController extends Controller ->offset($offset) ->limit($limit) ->get(); - + $data = []; if(count($memberList)>0){ $temp = []; @@ -668,7 +668,7 @@ class ClaimRequestController extends Controller $date = date('ymd'); // Menghasilkan kode dengan format yang diinginkan return self::$code_prefix . $sparator. 'H' . $sparator. $provideCode . $sparator. $date. $sparator . $member->currentPolicy->code . $sparator. $member->member_id . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT); - + } public function requestFiles(Request $request, $claim_id) @@ -800,7 +800,7 @@ class ClaimRequestController extends Controller // 'Reason', 'Diagnosis', 'Keterangan', - 'Catatan', + 'Catatan', 'Status', 'QC' ]; @@ -823,9 +823,9 @@ class ClaimRequestController extends Controller foreach($results as $item) { // $gr_total += $item->tot_bill; - // $requestLogData = RequestLogBenefit::selectRaw('*, - // (SELECT code FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_code, - // (SELECT description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_description, + // $requestLogData = RequestLogBenefit::selectRaw('*, + // (SELECT code FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_code, + // (SELECT description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_description, // sum(amount_incurred) AS total_incurred' // ) // ->where(['request_log_id' => $item->request_log_id, 'deleted_at' => null]) @@ -837,7 +837,7 @@ class ClaimRequestController extends Controller ->select( '*', // DB::raw('SUM(request_log_benefits.amount_incurred) AS total_incurred'), - + DB::raw(' (Select benefits.description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS benefit_description @@ -850,10 +850,18 @@ class ClaimRequestController extends Controller ->get(); if ($item->member){ $member = Member::where('member_id', $item->member->principal_id)->first(); - $memberPrincipal = $member->name; + if ($member){ + $memberPrincipal = $member->name; + } else { + $memberPrincipal = '-'; + } $memberPlan = MemberPlan::where('member_id', $item->member->id)->get('plan_id')->toArray(); $plan= Plan::whereIn('id', $memberPlan)->where('service_code', $item->requestLog->service_code)->first(); - $planCode = $plan->code; + if ($plan){ + $planCode = $plan->code; + } else { + $planCode = '-'; + } if ($item->member->currentCorporate->id == $item->requestLog->organization->corporate_id_partner){ $payor = $item->member->currentCorporate->name; } else { @@ -864,7 +872,7 @@ class ClaimRequestController extends Controller $planCode = '-'; $payor = '-'; } - + if (!$requestLogData->isEmpty()){ foreach($requestLogData as $key => $data){ $no++;