From a79b7b53e3d0176f99c6e15f7e79aafbbfeda082 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Mon, 19 Feb 2024 15:18:00 +0700
Subject: [PATCH] update bugs fix

---
 .../AlarmCenter/DataServiceMonitoring.php     |  6 ++--
 .../Api/DailyMonitoringController.php         |  2 +-
 app/Models/RequestDailyMonitoring.php         | 32 +++++++++----------
 .../pages/AlarmCenter/ServiceMonitoring.tsx   | 12 +++----
 4 files changed, 26 insertions(+), 26 deletions(-)

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