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

fix query hospital dashboard and search

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-03 05:28:07 +07:00
parent ba3b6a583d
commit 0115d3fbb3
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/Linksehat/Http/Controllers/Api/SearchController.php
View File

@@ -49,11 +49,11 @@ class SearchController extends Controller
$queryHospitals = Organization::query()
->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) {
$query->getQuery()
->selectRaw("organizations.id, organizations.name, addresses.text AS address, 6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance")
->selectRaw("organizations.id, organizations.name, addresses.text AS address, cities.name AS city_name, 6371 * acos (cos ( radians($request->lat) ) * cos( radians( addresses.lat ) ) * cos( radians( addresses.lng ) - radians($request->lng) ) + sin ( radians($request->lat) ) * sin( radians( addresses.lat ) )) as distance")
->orderBy('distance', 'ASC');
}, function (EloquentBuilder $query) {
$query->getQuery()
->select(['organizations.id', 'organizations.name', 'addresses.text AS address'])
->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name'])
->orderBy('organizations.name');
})
->leftJoin('addresses', function (Builder $query) {
@@ -65,6 +65,9 @@ class SearchController extends Controller
->leftJoin('specialities', function (Builder $query) {
$query->on('practitioner_roles.speciality_id', '=', 'specialities.id');
})
->leftJoin('cities', function ($query) {
$query->on('addresses.city_id', '=', 'cities.id');
})
->where('specialities.name', 'LIKE', "{$request->value}%")
->where('addresses.addressable_type', '=', Organization::class)
->whereNot('practitioner_roles.speciality_id')