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

update daily monitoring

Browse Source
This commit is contained in:
Tb Fajri
2024-02-19 10:29:13 +07:00
parent 8f904a8ce8
commit 15a99b95b9
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -35,28 +35,27 @@ class DailyMonitoringController extends Controller
];
}
/**
* Member List
*/
public function GetMemberList(Request $request)
{
$memberList = DB::table('request_logs')
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider', 'request_logs.organization_id' )
->where('request_logs.service_code', 'IP')
->where('request_logs.deleted_at', null)
->when($request->search, function ($q, $search) {
$q->where('members.member_id', 'LIKE', "%".$search."%");
$q->orWhere('members.name','LIKE',"%".$search."%");
$q->where(function ($subQ) use ($search) {
$subQ->where('members.member_id', 'LIKE', "%".$search."%");
$subQ->orWhere('members.name','LIKE',"%".$search."%");
});
})
// ->where('request_logs.status_final_log', 'approved')
->groupBy('request_logs.member_id')
->groupBy('request_logs.member_id', 'request_logs.organization_id')
->orderBy('request_logs.created_at', 'desc')
// ->get()
->paginate();
return Helper::paginateResources(DailyMonitoringResource::collection($memberList));
}
@@ -75,8 +74,10 @@ class DailyMonitoringController extends Controller
->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
->select('request_logs.id','request_logs.submission_date AS admission_date','request_logs.discharge_date','request_logs.code','services.name as service_name','request_logs.status','members.name', 'members.member_id')
->where('request_logs.service_code', 'IP')
->where('request_logs.status_final_log', 'approved')
->where('request_logs.deleted_at', null)
// ->where('request_logs.status_final_log', 'approved')
->where("request_logs.member_id", "=", $memberDetail->id)
->where("request_logs.organization_id", "=", $request->organization_id)
->when($request->search, function ($q, $search) {
$q->where('request_logs.code', 'LIKE', "%".$search."%");
})