From ce2c41704571151cb8dc8eaec784c46a7cba9fc6 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Mon, 24 Feb 2025 10:18:38 +0700 Subject: [PATCH] update --- .../Api/DailyMonitoringController.php | 69 +++++++++---------- .../Transformers/DailyMonitoringResource.php | 2 + .../DailyMonitoring/Model/Types.ts | 2 + .../views/pdf/final_log_page_1.blade.php | 2 +- 4 files changed, 39 insertions(+), 36 deletions(-) mode change 100644 => 100755 resources/views/pdf/final_log_page_1.blade.php diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php index 20826fb7..4465a747 100755 --- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php +++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php @@ -43,41 +43,40 @@ class DailyMonitoringController extends Controller $endDate = $request->end_date ? Carbon::parse($request->end_date)->addDay() : Carbon::today()->addDay(); $memberList = DB::table('request_log_daily_monitorings') - ->leftJoin('request_logs', 'request_log_daily_monitorings.request_log_id', '=', 'request_logs.id') - ->leftJoin('members', 'request_logs.member_id', '=', 'members.id') - ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id') - ->select( - 'members.member_id', - 'members.name', - 'members.birth_date', - 'members.record_type as member_type', - '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', - 'request_logs.code', - 'request_log_daily_monitorings.*' - ) - // ->where('request_logs.service_code', 'IP') - ->where('request_logs.deleted_at', null) - ->when($request->search, function ($q, $search) { - $q->where(function ($subQ) use ($search) { - $subQ->where('members.member_id', 'LIKE', "%".$search."%"); - $subQ->orWhere('members.name','LIKE',"%".$search."%"); - }); - }) - ->when($startDate, function ($q) use ($startDate) { - $q->where('request_log_daily_monitorings.submission_date', '>=', $startDate); - }) - ->when($endDate, function ($q) use ($endDate) { - $q->where('request_log_daily_monitorings.submission_date', '<=', Carbon::parse($endDate)->addDay()); - }) - // ->where('request_logs.status_final_log', 'approved') - // ->groupBy('request_logs.member_id', 'request_logs.organization_id') - ->orderBy('request_logs.created_at', 'desc') - // ->get() - ->paginate(); + ->leftJoin('request_logs', 'request_log_daily_monitorings.request_log_id', '=', 'request_logs.id') + ->leftJoin('members', 'request_logs.member_id', '=', 'members.id') + ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id') + ->select( + 'members.member_id', + 'members.name', + 'members.birth_date', + 'request_logs.type_of_member as member_type', + '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', + 'request_logs.code', + // Using a subquery to fetch medical_plan + DB::raw('(SELECT plan FROM request_log_medical_plan rdm WHERE rdm.request_log_daily_monitoring_id = request_log_daily_monitorings.id AND type = 1 LIMIT 1) as medical_plan'), + DB::raw('(SELECT plan FROM request_log_medical_plan rdm WHERE rdm.request_log_daily_monitoring_id = request_log_daily_monitorings.id AND type = 2 LIMIT 1) as non_medical_plan'), + 'request_log_daily_monitorings.*' + ) + ->whereNull('request_logs.deleted_at') // Use whereNull() for checking NULL + ->when($request->search, function ($q, $search) { + $q->where(function ($subQ) use ($search) { + $subQ->where('members.member_id', 'LIKE', "%{$search}%"); + $subQ->orWhere('members.name', 'LIKE', "%{$search}%"); + }); + }) + ->when($startDate, function ($q) use ($startDate) { + $q->where('request_log_daily_monitorings.submission_date', '>=', $startDate); + }) + ->when($endDate, function ($q) use ($endDate) { + $q->where('request_log_daily_monitorings.submission_date', '<=', Carbon::parse($endDate)->addDay()); + }) + ->orderBy('request_logs.created_at', 'desc') + ->paginate(); return Helper::paginateResources(DailyMonitoringResource::collection($memberList)); } diff --git a/Modules/Internal/Transformers/DailyMonitoringResource.php b/Modules/Internal/Transformers/DailyMonitoringResource.php index 5c53a31c..1a0f65d1 100755 --- a/Modules/Internal/Transformers/DailyMonitoringResource.php +++ b/Modules/Internal/Transformers/DailyMonitoringResource.php @@ -35,6 +35,8 @@ class DailyMonitoringResource extends JsonResource 'status' => $this->status, 'description' => strip_tags($this->description), 'note' => strip_tags($this->note), + 'medical_plan' => strip_tags($this->medical_plan), + 'non_medical_plan' => strip_tags($this->non_medical_plan), ]; return $data; diff --git a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts index 51654232..30560d16 100755 --- a/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts +++ b/frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts @@ -18,6 +18,8 @@ export type DailyMonitoringListType = { addmision_date : string, provider : string, organization_id : number, + medical_plan : string, + non_medical_plan : string, } /** diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php old mode 100644 new mode 100755 index 656245fc..d3cb93a7 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -242,7 +242,7 @@ {{ wordwrap($request_logs->code,15,"
\n")}} Tanggal : - {{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }} + {{ \Carbon\Carbon::parse($request_logs->approved_at)->format('d M Y') }} Kepada