diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
index 0a19f4ce..9ae4657d 100644
--- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
+++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
@@ -143,9 +143,9 @@ class DataServiceMonitoring extends JsonResource
'subject' => $requestLogDailyMonitoring->subject ?? null,
'object' => $requestLogDailyMonitoring->object ?? null,
'bodyTemperature' => $requestLogDailyMonitoring->body_temperature ?? null,
- 'sistole' => $requestLogDailyMonitoring->sistole . 'mm[Hg]' ?? null,
- 'diastole' => $requestLogDailyMonitoring->diastole . 'mm[Hg]' ?? null,
- 'respirationRate' => $requestLogDailyMonitoring->respiration_rate . '/min' ?? null,
+ 'sistole' => $requestLogDailyMonitoring->sistole ?? null,
+ 'diastole' => $requestLogDailyMonitoring->diastole ?? null,
+ 'respirationRate' => $requestLogDailyMonitoring->respiration_rate ?? null,
'analysis' => $requestLogDailyMonitoring->analysis ?? null,
'complaints' => $requestLogDailyMonitoring->complaints ?? null,
'plans' => $this->when($requestLogDailyMonitoring->requestLogMedicalPlans, collect($requestLogDailyMonitoring->requestLogMedicalPlans)
diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
index 9805bc73..6178fbd1 100644
--- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
+++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
@@ -115,7 +115,7 @@ class DailyMonitoringController extends Controller
'message' => "success",
'data' => [
'detail_list'=> $detail_list,
- 'organization_id' => $request_logs->organization_id
+ 'organization_id' => $request_logs ? $request_logs->organization_id : 0
]
],200);
}
diff --git a/app/Models/RequestDailyMonitoring.php b/app/Models/RequestDailyMonitoring.php
index b9918039..2d658f68 100644
--- a/app/Models/RequestDailyMonitoring.php
+++ b/app/Models/RequestDailyMonitoring.php
@@ -32,25 +32,25 @@ class RequestDailyMonitoring extends Model
protected $appends = ['medical_plan', 'non_medikamentosa_plan', 'document', 'discharge_date'];
- public function getBodyTemperatureAttribute()
- {
- return round($this->attributes['body_temperature'], 0);
- }
+ // public function getBodyTemperatureAttribute()
+ // {
+ // return round($this->attributes['body_temperature'], 0);
+ // }
- public function getSistoleAttribute()
- {
- return round($this->attributes['sistole'], 0);
- }
+ // public function getSistoleAttribute()
+ // {
+ // return round($this->attributes['sistole'], 0);
+ // }
- public function getDiastoleAttribute()
- {
- return round($this->attributes['diastole'], 0);
- }
+ // public function getDiastoleAttribute()
+ // {
+ // return round($this->attributes['diastole'], 0);
+ // }
- public function getRespirationRateAttribute()
- {
- return round($this->attributes['respiration_rate'], 0);
- }
+ // public function getRespirationRateAttribute()
+ // {
+ // return round($this->attributes['respiration_rate'], 0);
+ // }
public function getMedicalPlanAttribute()
{
diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
index eaafcaee..04c07946 100644
--- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
+++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
@@ -965,7 +965,7 @@ export default function ServiceMonitoring() {
{dailyMonitoring.bodyTemperature > 0
- ? dailyMonitoring.bodyTemperature
+ ? dailyMonitoring.bodyTemperature + ' C'
: '-'}
@@ -981,7 +981,7 @@ export default function ServiceMonitoring() {
{dailyMonitoring.sistole > 0
- ? dailyMonitoring.sistole
+ ? dailyMonitoring.sistole + ' mm[Hg]'
: '-'}
@@ -997,7 +997,7 @@ export default function ServiceMonitoring() {
{dailyMonitoring.diastole > 0
- ? dailyMonitoring.diastole
+ ? dailyMonitoring.diastole + ' mm[Hg]'
: '-'}
@@ -1015,13 +1015,13 @@ export default function ServiceMonitoring() {
{dailyMonitoring.respirationRate > 0
- ? dailyMonitoring.respirationRate
+ ? dailyMonitoring.respirationRate + ' / min'
: '-'}
-
+ {/*
Complaints
@@ -1036,7 +1036,7 @@ export default function ServiceMonitoring() {
-
+ */}
Analysis