From 8d94ebf5244c8bbb658fa6dd8c08a6674f9d89b6 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 26 Oct 2023 11:35:29 +0700 Subject: [PATCH] update bugs fix --- .../Http/Controllers/Api/ClaimRequestController.php | 8 +++++++- .../Http/Controllers/Api/ClaimRequestController.php | 8 +++++++- Modules/Internal/Http/Controllers/Api/ClaimController.php | 1 - app/Services/ClaimRequestService.php | 4 ++-- frontend/dashboard/src/@types/claims.ts | 1 + frontend/dashboard/src/@types/corporates.ts | 1 + frontend/dashboard/src/@types/member.ts | 4 ++++ frontend/dashboard/src/pages/Claims/List.tsx | 4 ++-- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimRequestController.php b/Modules/Client/Http/Controllers/Api/ClaimRequestController.php index 637ea2b4..5d01c090 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimRequestController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimRequestController.php @@ -51,7 +51,13 @@ class ClaimRequestController extends Controller $code = $this->getNextCode(); $member = Member::find($member_id); - $newClaimRequest = ClaimRequestService::storeClaimRequest(code: $code, member: $member, paymentType: 'reimbursement', serviceCode: $request->service_code[$key]); + $newClaimRequest = ClaimRequestService::storeClaimRequest( + row: [], + code: $code, + member: $member, + paymentType: 'reimbursement', + serviceCode: $request->service_code[$key], + ); ClaimRequested::dispatch($newClaimRequest); // Log History diff --git a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php index ccee7ce5..d8e6427b 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php @@ -68,7 +68,13 @@ class ClaimRequestController extends Controller ]); $code = $this->getNextCode(); $member = Member::find($request->member_id); - $newClaimRequest = ClaimRequestService::storeClaimRequest(code: $code, member: $member, paymentType: 'reimbursement', serviceCode: $request->service_code); + $newClaimRequest = ClaimRequestService::storeClaimRequest( + row: [], + code: $code, + member: $member, + paymentType: 'reimbursement', + serviceCode: $request->service_code + ); ClaimRequested::dispatch($newClaimRequest); diff --git a/Modules/Internal/Http/Controllers/Api/ClaimController.php b/Modules/Internal/Http/Controllers/Api/ClaimController.php index ed63aa50..78c739ea 100644 --- a/Modules/Internal/Http/Controllers/Api/ClaimController.php +++ b/Modules/Internal/Http/Controllers/Api/ClaimController.php @@ -404,7 +404,6 @@ class ClaimController extends Controller // ->latest() ->get()->toArray(); foreach ($claims as $index => $row){ - dd($row); $rowData = [ '', // Count of Usage $row['code'], // Claim Number diff --git a/app/Services/ClaimRequestService.php b/app/Services/ClaimRequestService.php index 20b43653..3141f436 100644 --- a/app/Services/ClaimRequestService.php +++ b/app/Services/ClaimRequestService.php @@ -20,10 +20,10 @@ use Str; class ClaimRequestService{ - public static function storeClaimRequest($row, $code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested', $organization_code = null) + public static function storeClaimRequest($row = null, $code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested', $organization_code = null) { // try { - + $organization = False; if($organization_code){ $organization = Organization::where('code', $organization_code)->first(); if (!$organization){ diff --git a/frontend/dashboard/src/@types/claims.ts b/frontend/dashboard/src/@types/claims.ts index bb2b8aed..229802f6 100644 --- a/frontend/dashboard/src/@types/claims.ts +++ b/frontend/dashboard/src/@types/claims.ts @@ -25,6 +25,7 @@ export type Claims = { payor_id: string; corporate_id: string; policy_number: string; + benefit_desc: string; member: Member; benefit: Benefit | boolean; status: string; diff --git a/frontend/dashboard/src/@types/corporates.ts b/frontend/dashboard/src/@types/corporates.ts index ff470d0f..50e9d8c9 100644 --- a/frontend/dashboard/src/@types/corporates.ts +++ b/frontend/dashboard/src/@types/corporates.ts @@ -5,6 +5,7 @@ export type Corporate = { code: string; name?: string; welcome_message?: string; + payor_id: string; help_text?: string; logo?: any; logo_url?: string; diff --git a/frontend/dashboard/src/@types/member.ts b/frontend/dashboard/src/@types/member.ts index c38b0640..8d56ecd9 100644 --- a/frontend/dashboard/src/@types/member.ts +++ b/frontend/dashboard/src/@types/member.ts @@ -1,5 +1,7 @@ // ---------------------------------------------------------------------- +import { Corporate, Plan } from "./corporates"; + export type Member = { id: string, member_id: string, @@ -18,4 +20,6 @@ export type Member = { relation_with_principal: string, bpjs_class: string, active: string, + current_plan: Plan, + current_corporate: Corporate, }; diff --git a/frontend/dashboard/src/pages/Claims/List.tsx b/frontend/dashboard/src/pages/Claims/List.tsx index 62a33508..91c0d5ae 100644 --- a/frontend/dashboard/src/pages/Claims/List.tsx +++ b/frontend/dashboard/src/pages/Claims/List.tsx @@ -92,8 +92,8 @@ export default function List() { @@ -190,7 +190,7 @@ export default function List() { {row.member?.current_corporate?.code} {row.member?.current_corporate?.current_policy?.code} {row.member?.member_id} - {row.benefit ? row.benefit?.description : '-'} + {row.benefit_desc} {row.status == 'draft' && ()}