diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 7ade795c..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( @@ -546,12 +554,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/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 3eab161a..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 @@