tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tb Fajri
2024-01-25 11:11:57 +07:00
parent 423fe7b182 f3b69c4540
commit 3d4aa9ec8a
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -240,8 +240,8 @@ class RequestLogController extends Controller
$query->orWhere('request_logs.code', 'like', "%" . $search . "%")
->orWhere('members.name', 'like', "%" . $search . "%")
->orWhere('request_logs.submission_date', 'like', "%" . $search . "%")
->orWhere('request_logs.service_code', 'like', "%" . ($search == 'outpatient' || $search == 'Outpatient' ? 'OP' : $search) . "%")
->orWhere('request_logs.service_code', 'like', "%" . ($search == 'inpatient' || $search == 'Inpatient' ? 'IP' : $search) . "%");
->orWhere('request_logs.discharge_date', 'like', "%" . $search . "%")
->orWhereRaw('(SELECT services.name FROM services WHERE services.code = request_logs.service_code LIMIT 1) LIKE ?', ["%" . $search . "%"]);
});
})
->when($request->has('orderBy'), function ($query) use ($request) {
@@ -296,12 +296,9 @@ class RequestLogController extends Controller
END AS status
'),
'request_logs.submission_date',
'request_logs.discharge_date',
DB::raw('
CASE
WHEN service_code = "OP" THEN "Outpatient"
WHEN service_code = "IP" THEN "Inpatient"
ELSE ""
END AS service_type
(SELECT services.name FROM services WHERE services.code = request_logs.service_code LIMIT 1) AS service_type
'),
DB::raw('
(SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider