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

fix bug search hospital in group

Browse Source
This commit is contained in:
Muhammad Fajar
2022-11-04 15:41:22 +07:00
parent 8a50d5c45d
commit 285bf10a80
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,12 @@ class SearchController extends Controller
->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) { ->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) {
$query->getQuery() $query->getQuery()
->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") ->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")
->groupBy(['organizations.id', 'organizations.name', 'addresses.text', 'practitioner_roles.organization_id', 'practitioner_roles.speciality_id', 'addresses.lat', 'addresses.lng'])
->orderBy('distance', 'ASC'); ->orderBy('distance', 'ASC');
}, function (EloquentBuilder $query) { }, function (EloquentBuilder $query) {
$query->getQuery() $query->getQuery()
->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name']) ->select(['organizations.id', 'organizations.name', 'addresses.text AS address', 'cities.name AS city_name'])
->groupBy(['organizations.id', 'organizations.name', 'addresses.text', 'practitioner_roles.organization_id', 'practitioner_roles.speciality_id'])
->orderBy('organizations.name'); ->orderBy('organizations.name');
}) })
->leftJoin('addresses', function (Builder $query) { ->leftJoin('addresses', function (Builder $query) {
@@ -64,7 +66,6 @@ class SearchController extends Controller
->where('specialities.name', 'LIKE', "{$request->value}%") ->where('specialities.name', 'LIKE', "{$request->value}%")
->where('addresses.addressable_type', '=', Organization::class) ->where('addresses.addressable_type', '=', Organization::class)
->whereNot('practitioner_roles.speciality_id') ->whereNot('practitioner_roles.speciality_id')
->groupBy(['practitioner_roles.organization_id', 'practitioner_roles.speciality_id'])
->get(); ->get();
return Helper::responseJson(data: ['hospitals' => HospitalResource::collection($queryHospitals)], message: 'Data rumah sakit berhasil di ambil'); return Helper::responseJson(data: ['hospitals' => HospitalResource::collection($queryHospitals)], message: 'Data rumah sakit berhasil di ambil');