From 57bbc5df9f80342f2650452119be6d3b33b42775 Mon Sep 17 00:00:00 2001 From: Muhammad Fajar Date: Fri, 4 Nov 2022 15:43:52 +0700 Subject: [PATCH] fix again grouping in search hospital --- Modules/Linksehat/Http/Controllers/Api/SearchController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Linksehat/Http/Controllers/Api/SearchController.php b/Modules/Linksehat/Http/Controllers/Api/SearchController.php index cde3eabc..7baa2eec 100644 --- a/Modules/Linksehat/Http/Controllers/Api/SearchController.php +++ b/Modules/Linksehat/Http/Controllers/Api/SearchController.php @@ -43,12 +43,12 @@ class SearchController extends Controller ->when($request->lat && $request->lng, function (EloquentBuilder $query) use ($request) { $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") - ->groupBy(['organizations.id', 'organizations.name', 'addresses.text', 'practitioner_roles.organization_id', 'practitioner_roles.speciality_id', 'addresses.lat', 'addresses.lng']) + ->groupBy(['organizations.id', 'organizations.name', 'addresses.text', 'practitioner_roles.organization_id', 'practitioner_roles.speciality_id', 'addresses.lat', 'addresses.lng', 'cities.name']) ->orderBy('distance', 'ASC'); }, function (EloquentBuilder $query) { $query->getQuery() ->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']) + ->groupBy(['organizations.id', 'organizations.name', 'addresses.text', 'practitioner_roles.organization_id', 'practitioner_roles.speciality_id', 'cities.name']) ->orderBy('organizations.name'); }) ->leftJoin('addresses', function (Builder $query) {