diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 2efc7cc2..94b5e96a 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -60,7 +60,7 @@ class CorporateMemberController extends Controller ]); } ]) - ->groupBy('members.id') + ->groupBy('members.id','members.person_id') ->paginate() ->appends($request->all()); return Helper::paginateResources(MemberDataTableResource::collection($members)); diff --git a/frontend/hospital-portal/src/pages/Dashboard.tsx b/frontend/hospital-portal/src/pages/Dashboard.tsx index ab771023..aa5ae9b3 100644 --- a/frontend/hospital-portal/src/pages/Dashboard.tsx +++ b/frontend/hospital-portal/src/pages/Dashboard.tsx @@ -79,7 +79,7 @@ export default function Dashboard() { } }) - setItemList(dummyData); + //setItemList(dummyData); } return (