diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 760103ed..7360e4ef 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -732,6 +732,23 @@ class RequestLogController extends Controller $data['signatureAd'] = $signatureAd; + $dataDiagnosis = []; + if($dataRequestLog->diagnosis) + { + $dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis); + foreach ($dataDiagnosiCodes as $diagnosisCode) + { + $diagnoisis = DB::table('icd') + ->where('icd.code', '=', $diagnosisCode) + ->select('icd.name', 'icd.code') + ->first(); + array_push($dataDiagnosis, $diagnoisis); + } + } + + $data['dataDiagnosis'] = $dataDiagnosis; + + $pdf = new Dompdf(); $options = new Options(); diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index c79ff891..1fbe673c 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -340,6 +340,8 @@ export default function TableListFinalLog() { setData( response.data.data.map((obj: any) => ({ ...obj, + provider:formatTitleCase(obj.provider), + full_name:formatTitleCase(obj.full_name), status: obj.status === 'requested' ? (