From 0fd79b8284eb5f5c4f0cc5c36f923183aa6dd133 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 28 Sep 2023 16:00:36 +0700 Subject: [PATCH] update requeset --- .../Api/ClaimRequestController.php | 2 +- .../ClaimReport/MemberResources.php | 1 + .../Transformers/ClaimRequestResource.php | 3 +- app/Services/CorporateMemberService.php | 5 +- .../src/pages/ClaimReport/Index.tsx | 6 +++ .../src/pages/ClaimReport/List.tsx | 14 +++-- .../src/pages/ClaimRequests/List.tsx | 52 +++++++++++++++++-- frontend/dashboard/src/pages/Claims/List.tsx | 6 +-- 8 files changed, 73 insertions(+), 16 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimRequestController.php b/Modules/Client/Http/Controllers/Api/ClaimRequestController.php index f2282084..1c2ea8e9 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimRequestController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimRequestController.php @@ -53,7 +53,7 @@ class ClaimRequestController extends Controller 'title' => 'New Claim Requested', 'description' => "Claim Requested for Member : {$member->member_id} - ({$member->full_name})", 'type' => 'info', - 'system_origin' => 'hospital-portal' + 'system_origin' => 'client-portal' ]); if ($request->hasFile('result_files')) { diff --git a/Modules/Client/Transformers/ClaimReport/MemberResources.php b/Modules/Client/Transformers/ClaimReport/MemberResources.php index 2b4128f6..b05435cf 100644 --- a/Modules/Client/Transformers/ClaimReport/MemberResources.php +++ b/Modules/Client/Transformers/ClaimReport/MemberResources.php @@ -16,6 +16,7 @@ class MemberResources extends JsonResource { return [ 'id' => $this->id, + 'codeRequest' => $this->code, 'memberId' => $this->member_id, 'fullName' => $this->full_name, 'division' => $this->division_name ?? '', diff --git a/Modules/Internal/Transformers/ClaimRequestResource.php b/Modules/Internal/Transformers/ClaimRequestResource.php index c173dc79..c4b1c49f 100644 --- a/Modules/Internal/Transformers/ClaimRequestResource.php +++ b/Modules/Internal/Transformers/ClaimRequestResource.php @@ -3,6 +3,7 @@ namespace Modules\Internal\Transformers; use Illuminate\Http\Resources\Json\JsonResource; +use Illuminate\Support\Str; class ClaimRequestResource extends JsonResource { @@ -15,7 +16,7 @@ class ClaimRequestResource extends JsonResource public function toArray($request) { $filesGroupByType = $this->files->mapToGroups(function($file) { - return [$file->type => $file]; + return [Str::slug($file->type, '_') => $file]; }); $data = [ diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php index b552ac21..03aa9370 100644 --- a/app/Services/CorporateMemberService.php +++ b/app/Services/CorporateMemberService.php @@ -70,16 +70,17 @@ class CorporateMemberService $orderBy = match ($request->orderBy) { 'memberId' => 'member_id', 'fullName' => 'name', + 'codeRequest' => 'code', default => '' }; - if (in_array($orderBy, ['member_id', 'name', 'active'])) { + if (in_array($orderBy, ['member_id', 'name', 'active', 'code'])) { $query->getQuery()->orderBy($orderBy, $request->order); } elseif ($request->orderBy === 'division') { $query->getQuery()->orderBy('corporate_divisions.name', $request->order); } }) - ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status']) + ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code']) ->paginate($limit); } diff --git a/frontend/client-portal/src/pages/ClaimReport/Index.tsx b/frontend/client-portal/src/pages/ClaimReport/Index.tsx index 35623dd7..af64d2e4 100644 --- a/frontend/client-portal/src/pages/ClaimReport/Index.tsx +++ b/frontend/client-portal/src/pages/ClaimReport/Index.tsx @@ -104,6 +104,12 @@ export default function Drugs() { label: 'Member ID', isSort: true, }, + { + id: 'codeRequest', + align: 'left', + label: 'Code Request', + isSort: true, + }, { id: 'fullName', align: 'center', diff --git a/frontend/client-portal/src/pages/ClaimReport/List.tsx b/frontend/client-portal/src/pages/ClaimReport/List.tsx index f41aa4bb..ca2b005d 100644 --- a/frontend/client-portal/src/pages/ClaimReport/List.tsx +++ b/frontend/client-portal/src/pages/ClaimReport/List.tsx @@ -45,8 +45,8 @@ export default function List() { /* -------------------------------------------------------------------------- */ /* ------------------------------ handle order ------------------------------ */ - const [order, setOrder] = useState('asc'); - const [orderBy, setOrderBy] = useState('fullName'); + const [order, setOrder] = useState('desc'); + const [orderBy, setOrderBy] = useState('codeRequest'); const orders = { order: order, @@ -112,6 +112,12 @@ export default function List() { label: 'Member ID', isSort: true, }, + { + id: 'codeRequest', + align: 'left', + label: 'Code Request', + isSort: true, + }, { id: 'fullName', align: 'left', @@ -123,13 +129,13 @@ export default function List() { id: 'division', align: 'left', label: 'Divisi', - isSort: true, + isSort: false, }, { id: 'status', align: 'center', label: 'Status', - isSort: true, + isSort: false, }, { id: 'action', diff --git a/frontend/dashboard/src/pages/ClaimRequests/List.tsx b/frontend/dashboard/src/pages/ClaimRequests/List.tsx index 87aaa67a..1b597e0c 100644 --- a/frontend/dashboard/src/pages/ClaimRequests/List.tsx +++ b/frontend/dashboard/src/pages/ClaimRequests/List.tsx @@ -195,7 +195,8 @@ export default function List() { {row.member?.current_policy?.code} {row.submission_date} {row.service_name} - {row.payment_type_name} + {/* {row.payment_type_name} */} + {'-'} @@ -236,17 +237,58 @@ export default function List() { > Berkas Hasil Penunjang - {row.files_by_type?.result && - row.files_by_type?.result.map((file, index) => ( + {/* {row.files_by_type?.claim_kondisi && + row.files_by_type?.claim_kondisi.map((file, index) => ( -{' '} {file.name} - ))} + ))} */} - {!row.files_by_type?.result && Tidak ada berkas} + {row.files_by_type?.claim_kondisi && ( + <> + - Kondisi + {row.files_by_type?.claim_kondisi.map((file, index) => ( + + + + {file.name} + + + ))} + + )} + + {row.files_by_type?.claim_diagnosis && ( + <> + - Diagnosa + {row.files_by_type?.claim_diagnosis.map((file, index) => ( + + + + {file.name} + + + ))} + + )} + + {row.files_by_type?.claim_result && ( + <> + - Hasil + {row.files_by_type?.claim_result.map((file, index) => ( + + + + {file.name} + + + ))} + + )} + {(!row.files_by_type?.claim_result && !row.files_by_type?.claim_diagnosis && !row.files_by_type?.claim_kondisi)&& Tidak ada berkas} diff --git a/frontend/dashboard/src/pages/Claims/List.tsx b/frontend/dashboard/src/pages/Claims/List.tsx index 2da719bf..c9ec2143 100644 --- a/frontend/dashboard/src/pages/Claims/List.tsx +++ b/frontend/dashboard/src/pages/Claims/List.tsx @@ -174,7 +174,7 @@ export default function List() { {row.claim_request?.code} - {row.code} + {/* {row.code} */} {row.member?.full_name} {row.plan?.code} {row.claim_request?.service?.name} @@ -234,9 +234,9 @@ export default function List() { Code Request - + {/* Code Claim - + */} Member Name