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

update

Browse Source
This commit is contained in:
Tb Fajri
2025-02-24 10:18:38 +07:00
parent 8ed6700339
commit ce2c417045
4 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,41 +43,40 @@ class DailyMonitoringController extends Controller
$endDate = $request->end_date ? Carbon::parse($request->end_date)->addDay() : Carbon::today()->addDay(); $endDate = $request->end_date ? Carbon::parse($request->end_date)->addDay() : Carbon::today()->addDay();
$memberList = DB::table('request_log_daily_monitorings') $memberList = DB::table('request_log_daily_monitorings')
->leftJoin('request_logs', 'request_log_daily_monitorings.request_log_id', '=', 'request_logs.id') ->leftJoin('request_logs', 'request_log_daily_monitorings.request_log_id', '=', 'request_logs.id')
->leftJoin('members', 'request_logs.member_id', '=', 'members.id') ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id') ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
->select( ->select(
'members.member_id', 'members.member_id',
'members.name', 'members.name',
'members.birth_date', 'members.birth_date',
'members.record_type as member_type', 'request_logs.type_of_member as member_type',
'members.members_effective_date AS startdate', 'members.members_effective_date AS startdate',
'members.members_expire_date AS enddate', 'members.members_expire_date AS enddate',
'request_logs.submission_date as addmision_date', 'request_logs.submission_date as addmision_date',
'organizations.name as provider', 'organizations.name as provider',
'request_logs.organization_id', 'request_logs.organization_id',
'request_logs.code', 'request_logs.code',
'request_log_daily_monitorings.*' // 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'),
// ->where('request_logs.service_code', 'IP') 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'),
->where('request_logs.deleted_at', null) 'request_log_daily_monitorings.*'
->when($request->search, function ($q, $search) { )
$q->where(function ($subQ) use ($search) { ->whereNull('request_logs.deleted_at') // Use whereNull() for checking NULL
$subQ->where('members.member_id', 'LIKE', "%".$search."%"); ->when($request->search, function ($q, $search) {
$subQ->orWhere('members.name','LIKE',"%".$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($startDate, function ($q) use ($startDate) {
->when($endDate, function ($q) use ($endDate) { $q->where('request_log_daily_monitorings.submission_date', '>=', $startDate);
$q->where('request_log_daily_monitorings.submission_date', '<=', Carbon::parse($endDate)->addDay()); })
}) ->when($endDate, function ($q) use ($endDate) {
// ->where('request_logs.status_final_log', 'approved') $q->where('request_log_daily_monitorings.submission_date', '<=', Carbon::parse($endDate)->addDay());
// ->groupBy('request_logs.member_id', 'request_logs.organization_id') })
->orderBy('request_logs.created_at', 'desc') ->orderBy('request_logs.created_at', 'desc')
// ->get() ->paginate();
->paginate();
return Helper::paginateResources(DailyMonitoringResource::collection($memberList)); return Helper::paginateResources(DailyMonitoringResource::collection($memberList));
} }

2
Modules/Internal/Transformers/DailyMonitoringResource.php
View File

@@ -35,6 +35,8 @@ class DailyMonitoringResource extends JsonResource
'status' => $this->status, 'status' => $this->status,
'description' => strip_tags($this->description), 'description' => strip_tags($this->description),
'note' => strip_tags($this->note), 'note' => strip_tags($this->note),
'medical_plan' => strip_tags($this->medical_plan),
'non_medical_plan' => strip_tags($this->non_medical_plan),
]; ];
return $data; return $data;

2
frontend/dashboard/src/pages/CaseManagement/DailyMonitoring/Model/Types.ts
View File

@@ -18,6 +18,8 @@ export type DailyMonitoringListType = {
addmision_date : string, addmision_date : string,
provider : string, provider : string,
organization_id : number, organization_id : number,
medical_plan : string,
non_medical_plan : string,
} }
/** /**

2
resources/views/pdf/final_log_page_1.blade.php Normal file → Executable file
View File

@@ -242,7 +242,7 @@
<td style="width: 29%;">{{ wordwrap($request_logs->code,15,"<br>\n")}}</td> <td style="width: 29%;">{{ wordwrap($request_logs->code,15,"<br>\n")}}</td>
<td style="width: 20%;">Tanggal</td> <td style="width: 20%;">Tanggal</td>
<td style="width: 1%;">:</td> <td style="width: 1%;">:</td>
<td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }}</td> <td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->approved_at)->format('d M Y') }}</td>
</tr> </tr>
<tr> <tr>
<td>Kepada</td> <td>Kepada</td>