diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php index b113a246..ceb75d10 100644 --- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php @@ -229,7 +229,7 @@ class CorporateMemberController extends Controller 'service:code,name', 'files', ]) - ->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id', 'diagnosis']); + ->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id', 'diagnosis', 'keterangan', 'catatan']); $dataBenefit = []; if (count($data->requestLogBenefits) > 0) { diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php index 9ae4657d..849e1f91 100644 --- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php +++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php @@ -105,6 +105,8 @@ class DataServiceMonitoring extends JsonResource 'name' => $requestLogBenefit->benefit->description, ]; })->all() ?? null, + 'keterangan' => $this->keterangan ?? null, + 'catatan' => $this->catatan ?? null, 'benefitTotal' => $this->benefitTotal ?? null, 'hospital' => $this->organization->name ?? null, 'admissionDate' => $this->submission_date ?? null, diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index 09b8b6bf..bbbb1f7b 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -203,6 +203,8 @@ type ServiceMonitoringProps = { }[]; }> >; + keterangan: string; + catatan: string; }; export default function ServiceMonitoring() { @@ -591,6 +593,44 @@ export default function ServiceMonitoring() { )} */} + {/* Keterangan */} + + + + {loading ? : 'Keterangan'} + + + + + {loading ? ( + + ) : data && data.keterangan ? ( + data.keterangan + ) : ( + '-' + )} + + + + {/* Catatan */} + + + + {loading ? : 'Catatan'} + + + + + {loading ? ( + + ) : data && data.catatan ? ( + data.catatan + ) : ( + '-' + )} + + +