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

update bugs fix

Browse Source
This commit is contained in:
Tb Fajri
2024-02-19 15:18:00 +07:00
parent 1e7576a5ce
commit a79b7b53e3
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,9 +143,9 @@ class DataServiceMonitoring extends JsonResource
'subject' => $requestLogDailyMonitoring->subject ?? null, 'subject' => $requestLogDailyMonitoring->subject ?? null,
'object' => $requestLogDailyMonitoring->object ?? null, 'object' => $requestLogDailyMonitoring->object ?? null,
'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null, 'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null,
'sistole' => $requestLogDailyMonitoring->sistole . 'mm[Hg]' ?? null, 'sistole' => $requestLogDailyMonitoring->sistole ?? null,
'diastole' => $requestLogDailyMonitoring->diastole . 'mm[Hg]' ?? null, 'diastole' => $requestLogDailyMonitoring->diastole ?? null,
'respirationRate' => $requestLogDailyMonitoring->respiration_rate . '/min' ?? null, 'respirationRate' => $requestLogDailyMonitoring->respiration_rate ?? null,
'analysis' => $requestLogDailyMonitoring->analysis ?? null, 'analysis' => $requestLogDailyMonitoring->analysis ?? null,
'complaints' => $requestLogDailyMonitoring->complaints ?? null, 'complaints' => $requestLogDailyMonitoring->complaints ?? null,
'plans' => $this->when($requestLogDailyMonitoring->requestLogMedicalPlans, collect($requestLogDailyMonitoring->requestLogMedicalPlans) 'plans' => $this->when($requestLogDailyMonitoring->requestLogMedicalPlans, collect($requestLogDailyMonitoring->requestLogMedicalPlans)

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

@@ -115,7 +115,7 @@ class DailyMonitoringController extends Controller
'message' => "success", 'message' => "success",
'data' => [ 'data' => [
'detail_list'=> $detail_list, 'detail_list'=> $detail_list,
'organization_id' => $request_logs->organization_id 'organization_id' => $request_logs ? $request_logs->organization_id : 0
] ]
],200); ],200);
} }

32
app/Models/RequestDailyMonitoring.php
View File

@@ -32,25 +32,25 @@ class RequestDailyMonitoring extends Model
protected $appends = ['medical_plan', 'non_medikamentosa_plan', 'document', 'discharge_date']; protected $appends = ['medical_plan', 'non_medikamentosa_plan', 'document', 'discharge_date'];
public function getBodyTemperatureAttribute() // public function getBodyTemperatureAttribute()
{ // {
return round($this->attributes['body_temperature'], 0); // return round($this->attributes['body_temperature'], 0);
} // }
public function getSistoleAttribute() // public function getSistoleAttribute()
{ // {
return round($this->attributes['sistole'], 0); // return round($this->attributes['sistole'], 0);
} // }
public function getDiastoleAttribute() // public function getDiastoleAttribute()
{ // {
return round($this->attributes['diastole'], 0); // return round($this->attributes['diastole'], 0);
} // }
public function getRespirationRateAttribute() // public function getRespirationRateAttribute()
{ // {
return round($this->attributes['respiration_rate'], 0); // return round($this->attributes['respiration_rate'], 0);
} // }
public function getMedicalPlanAttribute() public function getMedicalPlanAttribute()
{ {

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

@@ -965,7 +965,7 @@ export default function ServiceMonitoring() {
<Stack> <Stack>
<Typography variant="subtitle1"> <Typography variant="subtitle1">
{dailyMonitoring.bodyTemperature > 0 {dailyMonitoring.bodyTemperature > 0
? dailyMonitoring.bodyTemperature ? dailyMonitoring.bodyTemperature + ' C'
: '-'} : '-'}
</Typography> </Typography>
</Stack> </Stack>
@@ -981,7 +981,7 @@ export default function ServiceMonitoring() {
<Stack> <Stack>
<Typography variant="subtitle1"> <Typography variant="subtitle1">
{dailyMonitoring.sistole > 0 {dailyMonitoring.sistole > 0
? dailyMonitoring.sistole ? dailyMonitoring.sistole + ' mm[Hg]'
: '-'} : '-'}
</Typography> </Typography>
</Stack> </Stack>
@@ -997,7 +997,7 @@ export default function ServiceMonitoring() {
<Stack> <Stack>
<Typography variant="subtitle1"> <Typography variant="subtitle1">
{dailyMonitoring.diastole > 0 {dailyMonitoring.diastole > 0
? dailyMonitoring.diastole ? dailyMonitoring.diastole + ' mm[Hg]'
: '-'} : '-'}
</Typography> </Typography>
</Stack> </Stack>
@@ -1015,13 +1015,13 @@ export default function ServiceMonitoring() {
<Stack> <Stack>
<Typography variant="subtitle1"> <Typography variant="subtitle1">
{dailyMonitoring.respirationRate > 0 {dailyMonitoring.respirationRate > 0
? dailyMonitoring.respirationRate ? dailyMonitoring.respirationRate + ' / min'
: '-'} : '-'}
</Typography> </Typography>
</Stack> </Stack>
</Grid> </Grid>
</Stack> </Stack>
<Stack direction={'row'} sx={{ paddingY: 1 }} spacing={2}> {/* <Stack direction={'row'} sx={{ paddingY: 1 }} spacing={2}>
<Grid item xs={6} lg={6} md={6}> <Grid item xs={6} lg={6} md={6}>
<Stack> <Stack>
<Typography variant="inherit">Complaints</Typography> <Typography variant="inherit">Complaints</Typography>
@@ -1036,7 +1036,7 @@ export default function ServiceMonitoring() {
</Typography> </Typography>
</Stack> </Stack>
</Grid> </Grid>
</Stack> </Stack> */}
<Stack spacing={1}> <Stack spacing={1}>
<Typography variant="h6" sx={{ paddingTop: 2 }}> <Typography variant="h6" sx={{ paddingTop: 2 }}>
Analysis Analysis