From c3a39cedd0456359cf691d5c3e79e7e121cd4183 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 08:30:46 +0700 Subject: [PATCH 01/11] Update Keterangan Kebalik dengan Catatan --- 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 24fbae05..061dbddd 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -491,8 +491,8 @@ class ClaimController extends Controller !empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '', !empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '', !empty($item->diagnosis) ? $item->diagnosis : '', - !empty($item->catatan) ? $item->catatan : '', !empty($item->keterangan) ? $item->keterangan : '', + !empty($item->catatan) ? $item->catatan : '', ]; array_push($dataRow,$rowData); From 6ceceb65cedb43502e951f96400d48c3ded74eae Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 08:57:08 +0700 Subject: [PATCH 02/11] Update file format image --- .../src/sections/dashboard/DialogFinalLog.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx index 703a6f71..ad566dde 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx @@ -196,7 +196,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS style={{ display: 'none' }} multiple onChange={handleKondisiInputChange} - accept="application/pdf" + accept="application/pdf,image/*" /> @@ -257,7 +257,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS style={{ display: 'none' }} multiple onChange={handleDiagnosaInputChange} - accept="application/pdf" + accept="application/pdf,image/*" /> @@ -318,7 +318,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS style={{ display: 'none' }} multiple onChange={handleResultInputChange} - accept="application/pdf" + accept="application/pdf,image/*" /> From d7fe8a8d83fa3f9c37e034448c7ce121dcdd6ca9 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:07:47 +0700 Subject: [PATCH 03/11] Update --- .../Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index ca7a3e08..9219750d 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -62,7 +62,7 @@ class RequestLogController extends Controller { //insert data to organization try { - if(!$request->organization_id) + if($request->organization_name) { // Memulai transaksi DB::beginTransaction(); From 984232a9265e29e3ced9d9bb2f402c9b4c3ea0c5 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:13:41 +0700 Subject: [PATCH 04/11] Update --- .../Http/Controllers/Api/RequestLogController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 9219750d..6c340495 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -40,7 +40,7 @@ class RequestLogController extends Controller 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), ]); - if($request->organization_id) + if(!empty($request->organization_id)) { $validator = Validator::make($request->all(), [ 'organization_id' => 'required', @@ -62,7 +62,7 @@ class RequestLogController extends Controller { //insert data to organization try { - if($request->organization_name) + if (!empty($request->organization_name) && !empty($request->address_provider)) { // Memulai transaksi DB::beginTransaction(); From cc44f1f84eae46e522ff3844243b7fd9dab1521a Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:16:01 +0700 Subject: [PATCH 05/11] Update --- .../Http/Controllers/Api/RequestLogController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 6c340495..68d0ca58 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -26,8 +26,8 @@ class RequestLogController extends Controller 'member_id' => $request->member_id, 'service_code' => $request->service_code, 'organization_id' => $request->organization_id, - 'organization_name' => $request->organization_name, - 'address_provider' => $request->address_provider, + 'organization_name' => !empty($request->organization_name) ? $request->organization_name : null, + 'address_provider' => !empty($request->address_provider) ? $request->address_provider : null, 'submission_date' => $request->submission_date, 'corporate_id_partner' => $request->corporate_id_partner, ]; From 37e61e4ae0b4ed093619890a727eb35b8dcdf058 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:17:24 +0700 Subject: [PATCH 06/11] Update --- .../Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 68d0ca58..bd6091ff 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -29,7 +29,7 @@ class RequestLogController extends Controller 'organization_name' => !empty($request->organization_name) ? $request->organization_name : null, 'address_provider' => !empty($request->address_provider) ? $request->address_provider : null, 'submission_date' => $request->submission_date, - 'corporate_id_partner' => $request->corporate_id_partner, + 'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [], ]; $validator = Validator::make($request->all(), [ 'member_id' => 'required', From 6ed3e0c382e982cd20c9149e8b9793d0229da27d Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:36:48 +0700 Subject: [PATCH 07/11] Update --- Modules/Internal/Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index a4479d40..16a2652f 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -106,7 +106,7 @@ class RequestLogController extends Controller ]); if ($request->member_id){ - $code = $this->getNextCode($request); + $code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null; $member = Member::find($request->member_id); $memberValid = false; From 323e7fa2dea67a6949675b773b41ce527d8c94f4 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:39:23 +0700 Subject: [PATCH 08/11] Bug --- Modules/Internal/Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 16a2652f..2e268b36 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -106,7 +106,7 @@ class RequestLogController extends Controller ]); if ($request->member_id){ - $code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null; + $code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : '0000'; $member = Member::find($request->member_id); $memberValid = false; From f7e45bd15560d9714d98fd710f46798e3e3b9e22 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:42:49 +0700 Subject: [PATCH 09/11] Update --- .../Controllers/Api/RequestLogController.php | 69 ++++++++++--------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index bd6091ff..4efa778e 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -111,42 +111,47 @@ class RequestLogController extends Controller } $requestLogControllerInstance = new PrimeCenterRequestLog(); - $response = $requestLogControllerInstance->createNew($request); - - if($response->original['statusCode'] == 200) - { - //send email - // Insert data notifications - $emailTo = 'alarm.center@linksehat.com'; - $dataNotif = [ - 'email' => $emailTo, - 'title' => 'Request LOG', - 'description' => 'Request LOG from Hospital Portal', - 'type' => 1, - 'isUnRead' => true, - 'created_by' => auth()->user()->id, - 'created_at' => date('Y-m-d H:i:s'), - 'updated_at' => date('Y-m-d H:i:s'), - ]; - $sendNotif = Helper::insertNotification($dataNotif); - // Send Email after insert notifications - if($sendNotif) + try { + $response = $requestLogControllerInstance->createNew($request); + + if($response->original['statusCode'] == 200) { - //send to alarm - $nameTo = 'Admin LinkSehat'; - $dataEmail = [ + //send email + // Insert data notifications + $emailTo = 'alarm.center@linksehat.com'; + $dataNotif = [ 'email' => $emailTo, - 'name' => $nameTo, - 'subject' => 'Request LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'), - 'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(), + 'title' => 'Request LOG', + 'description' => 'Request LOG from Hospital Portal', + 'type' => 1, + 'isUnRead' => true, + 'created_by' => auth()->user()->id, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]; - Helper::sendEmail($dataEmail); + $sendNotif = Helper::insertNotification($dataNotif); + // Send Email after insert notifications + if($sendNotif) + { + //send to alarm + $nameTo = 'Admin LinkSehat'; + $dataEmail = [ + 'email' => $emailTo, + 'name' => $nameTo, + 'subject' => 'Request LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'), + 'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(), + ]; + Helper::sendEmail($dataEmail); + } + return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200); } - return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200); - } - else - { - return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500); + else + { + return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500); + } + } catch (\Exception $e) { + // Tangani kesalahan di sini + return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500); } } catch (\Exception $e) { // Rollback transaksi jika terjadi kesalahan From 90c7460c7b5371ba1775e836f1397e76b30a6a98 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:45:00 +0700 Subject: [PATCH 10/11] test error --- .../Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 4efa778e..bae1d278 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -147,7 +147,7 @@ class RequestLogController extends Controller } else { - return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500); + return ApiResponse::apiResponse('requestLogControllerInstance', $data, trans('Message.server_error'), 500); } } catch (\Exception $e) { // Tangani kesalahan di sini From e2e0fc52fc001585576ccb5c1bd5558b1e6f29b2 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 9 Feb 2024 09:46:50 +0700 Subject: [PATCH 11/11] test erro --- .../Http/Controllers/Api/RequestLogController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index bae1d278..8833587b 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -147,18 +147,18 @@ class RequestLogController extends Controller } else { - return ApiResponse::apiResponse('requestLogControllerInstance', $data, trans('Message.server_error'), 500); + return ApiResponse::apiResponse('requestLogControllerInstance1', $data, trans('Message.server_error'), 500); } } catch (\Exception $e) { // Tangani kesalahan di sini - return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500); + return ApiResponse::apiResponse('requestLogControllerInstance2', $data, $e->getMessage(), 500); } } catch (\Exception $e) { // Rollback transaksi jika terjadi kesalahan DB::rollBack(); // Handle error, bisa di-log atau dikembalikan sebagai response - return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500); + return ApiResponse::apiResponse('requestLogControllerInstance3', $data, $e->getMessage(), 500); } } }