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

tambah keterangan di detail alarm center

Browse Source
This commit is contained in:
Tb Fajri
2024-03-05 11:37:36 +07:00
parent 3bae411dc6
commit e358623716
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Client/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -229,7 +229,7 @@ class CorporateMemberController extends Controller
'service:code,name', 'service:code,name',
'files', '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 = []; $dataBenefit = [];
if (count($data->requestLogBenefits) > 0) { if (count($data->requestLogBenefits) > 0) {

2
Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
View File

@@ -105,6 +105,8 @@ class DataServiceMonitoring extends JsonResource
'name' => $requestLogBenefit->benefit->description, 'name' => $requestLogBenefit->benefit->description,
]; ];
})->all() ?? null, })->all() ?? null,
'keterangan' => $this->keterangan ?? null,
'catatan' => $this->catatan ?? null,
'benefitTotal' => $this->benefitTotal ?? null, 'benefitTotal' => $this->benefitTotal ?? null,
'hospital' => $this->organization->name ?? null, 'hospital' => $this->organization->name ?? null,
'admissionDate' => $this->submission_date ?? null, 'admissionDate' => $this->submission_date ?? null,

40
frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
View File

@@ -203,6 +203,8 @@ type ServiceMonitoringProps = {
}[]; }[];
}> }>
>; >;
keterangan: string;
catatan: string;
}; };
export default function ServiceMonitoring() { export default function ServiceMonitoring() {
@@ -591,6 +593,44 @@ export default function ServiceMonitoring() {
)} )}
</Grid> */} </Grid> */}
</Grid> </Grid>
{/* Keterangan */}
<Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}>
{loading ? <Skeleton animation={'wave'} width={200} /> : 'Keterangan'}
</Typography>
</Grid>
<Grid item xs={12}>
<Typography variant="subtitle1" color={'grey.800'}>
{loading ? (
<Skeleton animation={'wave'} width={300} />
) : data && data.keterangan ? (
data.keterangan
) : (
'-'
)}
</Typography>
</Grid>
</Grid>
{/* Catatan */}
<Grid item container xs={12} spacing={1.5}>
<Grid item xs={12}>
<Typography variant="subtitle2" color={'grey.600'}>
{loading ? <Skeleton animation={'wave'} width={200} /> : 'Catatan'}
</Typography>
</Grid>
<Grid item xs={12}>
<Typography variant="subtitle1" color={'grey.800'}>
{loading ? (
<Skeleton animation={'wave'} width={300} />
) : data && data.catatan ? (
data.catatan
) : (
'-'
)}
</Typography>
</Grid>
</Grid>
</Grid> </Grid>
</Grid> </Grid>