From 16e6aa08ddf99f23cd959bacccafcda09a6cd6ad Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 22 Feb 2024 08:36:31 +0700 Subject: [PATCH 1/4] Update penjamin export excel --- .../Http/Controllers/Api/ClaimController.php | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php index 061dbddd..2b7537ab 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -380,9 +380,9 @@ class ClaimController extends Controller DB::raw(' (Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik '), - DB::raw(' - "LinkSehat" AS penjamin - '), + // DB::raw(' + // "LinkSehat" AS penjamin + // '), DB::raw(' (Select corporates.name FROM corporates LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id @@ -426,6 +426,18 @@ class ClaimController extends Controller ) ->first(); + //get penjamin + $penjamin = 'LinkSehat'; + if(!empty($dataRumahSakit->corporate_id_partner)) + { + $corporate_id_partners = explode(',', $dataRumahSakit->corporate_id_partner); + $valueToCheck = $dataMember->id_perusahaan; + + if (in_array($valueToCheck, $corporate_id_partners)) { + $penjamin = $dataMember->nama_perusahaan; + } + } + //Nama Karyawan $data['namaKaryawan'] = ''; if($dataMember->principal_id) @@ -480,7 +492,7 @@ class ClaimController extends Controller !empty($dataMember->name) ? $dataMember->name : '', $data['namaKaryawan'], !empty($dataMember->code_plan) ? $dataMember->code_plan : '', - 'LinkSehat', + $penjamin, !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '', !empty($dataMember->no_polis) ? $dataMember->no_polis : '', ($firtIndex == $index ? $item->tot_bill : ''), @@ -513,7 +525,7 @@ class ClaimController extends Controller !empty($dataMember->name) ? $dataMember->name : '', $data['namaKaryawan'], !empty($dataMember->code_plan) ? $dataMember->code_plan : '', - 'LinkSehat', + $penjamin, !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '', !empty($dataMember->no_polis) ? $dataMember->no_polis : '', '', From b493b8c0a6a87f0ab22ea53cad5f9a886c1640e1 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 22 Feb 2024 08:51:49 +0700 Subject: [PATCH 2/4] Update loading terus menerus --- .../src/pages/AlarmCenter/List.tsx | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/List.tsx b/frontend/client-portal/src/pages/AlarmCenter/List.tsx index a2c9e7f3..78198237 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx @@ -298,26 +298,26 @@ export default function List() { setData( response.data.data.map((obj: any) => ({ ...obj, - start_date: , - end_date: , + start_date: obj.start_date ? : '-', + end_date: obj.end_date ? : '-', action: ( - navigate('member/' + obj.id)}> - - View - - handleDocumentClick(obj.link_document)}> - - Document Member - + navigate('member/' + obj.id)}> + + View + + handleDocumentClick(obj.link_document)}> + + Document Member + - } + } /> - ), })) + ); setPaginationTable(response.data); From d6197330d3374fd0eeffb275b4456e10a571e1da Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 22 Feb 2024 09:07:12 +0700 Subject: [PATCH 3/4] Update --- frontend/client-portal/src/pages/AlarmCenter/List.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/List.tsx b/frontend/client-portal/src/pages/AlarmCenter/List.tsx index 78198237..ecc8b454 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/List.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/List.tsx @@ -298,8 +298,8 @@ export default function List() { setData( response.data.data.map((obj: any) => ({ ...obj, - start_date: obj.start_date ? : '-', - end_date: obj.end_date ? : '-', + start_date: obj.start_date && obj.start_date != '0000-00-00' ? : '-', + end_date: obj.end_date && obj.end_date != '0000-00-00' ? : '-', action: ( Date: Thu, 22 Feb 2024 09:14:53 +0700 Subject: [PATCH 4/4] Update --- Modules/Client/Http/Controllers/Api/ClaimController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php index 2b7537ab..fefb1a9c 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -364,7 +364,7 @@ class ClaimController extends Controller ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id') ->where('organizations.id', '=', $item->organization_id) ->where('addresses.addressable_type', '=', 'App\Models\Organization') - ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit') + ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit', 'organizations.corporate_id_partner') ->first(); //Data Member $dataMember = DB::table('members')