From 55f4aafadb27ece19075f6299bd13b62b180440f Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 8 Jan 2024 09:04:05 +0700 Subject: [PATCH 1/3] Update Hospital Portal --- .../Http/Controllers/Api/RequestLogController.php | 6 +++++- resources/views/pdf/final_log_page_1.blade.php | 2 +- resources/views/pdf/final_log_page_2.blade.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 7ade795c..5656daa0 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -546,12 +546,16 @@ class RequestLogController extends Controller $data['request_logs'] = $dataRequestLog; $dataClaimLog = DB::table('request_log_benefits') - ->where('request_log_benefits.request_log_id', '=', 2) + ->where('request_log_benefits.request_log_id', '=', $request_log_id) ->select( '*', DB::raw(' (Select benefits.description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS benfit + '), + DB::raw(' + (Select benefits.code FROM benefits + WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS code ') ) ->get(); diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index 3eab161a..d193e714 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -352,7 +352,7 @@ @endphp {{ $No++ }} - {{ $claimLog->benfit}} + {{ $claimLog->code . '-' . $claimLog->benfit }} {{ number_format($claimLog->amount_incurred, 2, ',', '.') }} {{ number_format($claimLog->amount_approved, 2, ',', '.') }} {{ number_format($claimLog->excess_paid, 2, ',', '.') }} diff --git a/resources/views/pdf/final_log_page_2.blade.php b/resources/views/pdf/final_log_page_2.blade.php index fa731fe8..f849a8c2 100644 --- a/resources/views/pdf/final_log_page_2.blade.php +++ b/resources/views/pdf/final_log_page_2.blade.php @@ -259,7 +259,7 @@ Customer Service Team
- (Nama Petugas) + (.......................................)
{{ $dataMember->name }} From 8f45808078906432869bac75c28fad4986dc65cf Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 8 Jan 2024 11:34:09 +0700 Subject: [PATCH 2/3] Update Hospital --- .../Http/Controllers/Api/RequestLogController.php | 8 ++++++++ .../hospital-portal/src/sections/dashboard/TableList.tsx | 6 ++++++ .../src/sections/dashboard/TableListFinalLog.tsx | 6 ++++++ resources/views/pdf/final_log_page_1.blade.php | 9 +++++++-- resources/views/pdf/req_log_page_1.blade.php | 6 +++--- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 5656daa0..1359465b 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -185,6 +185,9 @@ class RequestLogController extends Controller WHEN request_logs.status = "reviewed" THEN "reviewed" ELSE "" END AS status + '), + DB::raw(' + (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider '), 'request_logs.submission_date') ->paginate($limit); @@ -265,6 +268,9 @@ class RequestLogController extends Controller ELSE "" END AS service_type '), + DB::raw(' + (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider + '), DB::raw(' (Select request_log_id FROM claim_requests WHERE claim_requests.request_log_id = request_logs.id LIMIT 1) AS check_claim ') @@ -360,6 +366,7 @@ class RequestLogController extends Controller $dataRequestLog = DB::table('request_logs') ->where('request_logs.id', '=', $request_log_id) ->first(); + $data['dataRequestLog'] = $dataRequestLog; $dataMember = DB::table('members') ->where('members.id', '=', $dataRequestLog->member_id) ->select( @@ -480,6 +487,7 @@ class RequestLogController extends Controller $dataRequestLog = DB::table('request_logs') ->where('request_logs.id', '=', $request_log_id) ->first(); + $data['dataRequestLog'] = $dataRequestLog; $dataMember = DB::table('members') ->where('members.id', '=', $dataRequestLog->member_id) ->select( diff --git a/frontend/hospital-portal/src/sections/dashboard/TableList.tsx b/frontend/hospital-portal/src/sections/dashboard/TableList.tsx index c484f4ed..1df44075 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableList.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableList.tsx @@ -234,6 +234,12 @@ function handleChangeTab(event: React.SyntheticEvent, newValue: string) { label: localeData.txtRequestCode, isSort: true, }, + { + id: 'provider', + align: 'left', + label: localeData.txtProvider, + isSort: true, + }, { id: 'full_name', align: 'left', diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index 64693eb3..8226a0d7 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -221,6 +221,12 @@ export default function TableListFinalLog() { label: localeData.txtRequestCode, isSort: true, }, + { + id: 'provider', + align: 'left', + label: localeData.txtProvider, + isSort: true, + }, { id: 'full_name', align: 'left', diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index d193e714..80928fee 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -296,7 +296,7 @@ Hak Kamar Pasien : - + {{ !empty($dataRequestLog->hak_kamar_pasien) ? $dataRequestLog->hak_kamar_pasien : ''}} Mata Uang : {{ $dataMember->mata_uang }} @@ -304,7 +304,7 @@ Penempatan Kamar : - + {{ !empty($dataRequestLog->penempatan_kamar) ? $dataRequestLog->penempatan_kamar : ''}} Alamat Provider : {{ !empty($rumahSakit->alamat_rumahsakit) ? $rumahSakit->alamat_rumahsakit : '' }} @@ -377,6 +377,11 @@ CATATAN + + + {{ !empty($dataRequestLog->catatan) ? $dataRequestLog->catatan : ''}} + +
@php diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php index 733e0365..b345d376 100644 --- a/resources/views/pdf/req_log_page_1.blade.php +++ b/resources/views/pdf/req_log_page_1.blade.php @@ -296,7 +296,7 @@ Hak Kamar Pasien : - + {{ !empty($dataRequestLog->hak_kamar_pasien) ? $dataRequestLog->hak_kamar_pasien : ''}} Mata Uang : {{ $dataMember->mata_uang }} @@ -304,7 +304,7 @@ Penempatan Kamar : - + {{ !empty($dataRequestLog->penempatan_kamar) ? $dataRequestLog->penempatan_kamar : ''}} Alamat Provider : {{ !empty($rumahSakit->alamat_rumahsakit) ? $rumahSakit->alamat_rumahsakit : '' }} @@ -327,7 +327,7 @@
- Keterangan: + Keterangan: {{ !empty($dataRequestLog->keterangan) ? $dataRequestLog->keterangan : ''}}
Mohon konfirmasi ke LinkSehat (Alarm Center Makassar) jika ada rujukan pasien ke spesialis lain.
From ac6589e42429cecd45183a5b7a9af45dc79f018e Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 8 Jan 2024 11:48:10 +0700 Subject: [PATCH 3/3] Update --- resources/views/pdf/req_log_page_1.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php index b345d376..bb53736b 100644 --- a/resources/views/pdf/req_log_page_1.blade.php +++ b/resources/views/pdf/req_log_page_1.blade.php @@ -327,7 +327,7 @@
- Keterangan: {{ !empty($dataRequestLog->keterangan) ? $dataRequestLog->keterangan : ''}} + Keterangan: {{ !empty($dataRequestLog->keterangan) ? $dataRequestLog->keterangan : ''}}
Mohon konfirmasi ke LinkSehat (Alarm Center Makassar) jika ada rujukan pasien ke spesialis lain.