diff --git a/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php b/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php index 0f12ef1e..83cd5b01 100644 --- a/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php +++ b/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php @@ -82,7 +82,7 @@ class DoctorRatingController extends Controller // ->where('request_logs.status_final_log', '=', 'approved') ->select( DB::connection('oldlms')->raw("CONCAT(tm_users.sFirstName, ' ', IFNULL(tm_users.sMiddleName, ''), ' ', IFNULL(tm_users.sLastName, '')) as nama_peserta"), - 'tx_dokter_rating.nRating', + 'tx_dokter_rating.nRating as rating', 'tx_dokter_rating.sNotes', 'tx_dokter_rating.dCreateOn', DB::connection('oldlms')->raw(" diff --git a/frontend/dashboard/src/pages/Report/DoctorRating_v2/List.tsx b/frontend/dashboard/src/pages/Report/DoctorRating_v2/List.tsx index b28b942f..90b85eec 100644 --- a/frontend/dashboard/src/pages/Report/DoctorRating_v2/List.tsx +++ b/frontend/dashboard/src/pages/Report/DoctorRating_v2/List.tsx @@ -575,7 +575,7 @@ import { isSort: false, }, { - id: 'tanggal_konsultasi', + id: 'dCreateOn', align: 'left', label: 'Tanggal Konsultasi', isSort: true, @@ -632,7 +632,7 @@ import { */} {row?.nama_peserta} {row?.nama_dokter} - {row?.nRating} + {row?.rating} {row?.sNotes} {row?.dCreateOn ? fDateTime(row?.dCreateOn) : ''} {/* {row?.dCreateOn ? fDateTime(row?.dCreateOn) : ''} */}