Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

This commit is contained in:
2024-01-30 14:26:47 +07:00
5 changed files with 25 additions and 26 deletions

View File

@@ -224,7 +224,8 @@ class RequestLogController extends Controller
DB::raw('
(SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider
'),
'request_logs.submission_date')
'request_logs.submission_date',
'request_logs.approved_at')
->paginate($limit);
return response()->json(Helper::paginateResources($results));
}
@@ -297,6 +298,7 @@ class RequestLogController extends Controller
END AS status
'),
'request_logs.submission_date',
'request_logs.approved_final_log_at',
'request_logs.discharge_date',
DB::raw('
(SELECT services.name FROM services WHERE services.code = request_logs.service_code LIMIT 1) AS service_type