diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
index 93f4e075..d853b3fe 100755
--- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
@@ -234,9 +234,17 @@ class CorporateMemberController extends Controller
public function generateLog($member_id)
{
$member = Member::findOrFail($member_id)
- ->load(['currentPlan', 'currentPolicy', 'currentPlan.corporateBenefits', 'currentPlan.corporateBenefits.benefit']);
+ ->load([
+ 'currentPlan',
+ 'currentPolicy',
+ 'currentPlan.corporateBenefits' => function ($benefit) use ($request) {
+ return $benefit->when($request->benefit_ids, function ($q, $ids) {
+ return $q->whereIn('benefit_id', $ids);
+ });
+ },
+ 'currentPlan.corporateBenefits.benefit']);
- // dd($member->currentPlan->corporateBenefits->toArray());
+ $dateOfAdmission = $request->date_of_admission ? Carbon::parse($request->date_of_admission) : now();
// return view('pdf.guaranted_leter', compact('member'));
$pdf = PDF::loadView('pdf.guaranted_leter', compact('member'));
diff --git a/frontend/dashboard/src/pages/Report/Appointments/List.tsx b/frontend/dashboard/src/pages/Report/Appointments/List.tsx
index e6a5c5b5..bb6868f6 100644
--- a/frontend/dashboard/src/pages/Report/Appointments/List.tsx
+++ b/frontend/dashboard/src/pages/Report/Appointments/List.tsx
@@ -212,10 +212,10 @@ export default function List() {
Metode Pembayaran: {row.payment_method}
HIS RegID: {row.his_detail?.sRegID}
HIS Medrec: {row.his_detail?.Medrec}
- No HP: {row.patient.sPhone ?? ''}
- E-mail: {row.patient.sEmail ?? ''}
- Alamat: {row.patient.detail.sAlamat ?? ''}
- KTP: {row.patient.detail.sKTP ?? ''}
+ No HP: {row.patient?.sPhone ?? ''}
+ E-mail: {row.patient?.sEmail ?? ''}
+ Alamat: {row.patient?.detail?.sAlamat ?? ''}
+ KTP: {row.patient?.detail?.sKTP ?? ''}