logicpowerhouse 4 жил өмнө
parent
commit
80d8055718

+ 9 - 0
app/Models/Client.php

@@ -121,6 +121,15 @@ class Client extends Model
             ->orderBy('effective_date', 'desc');
     }
 
+    public function nonZeroMeasurements()
+    {
+        return $this->hasMany(Measurement::class, 'client_id', 'id')
+            /*->distinct('label')*/
+            ->where('is_removed', false)
+            ->where('is_cellular_zero', false)
+            ->orderBy('effective_date', 'desc');
+    }
+
     public function currentCareMonth()
     {
         $cmStartDate = strtotime(date('Y-m-d'));

+ 2 - 2
resources/views/app/patient/vitals-graph.blade.php

@@ -46,7 +46,7 @@
         $nextDay = date_format(date_add(date_create($nextDay), date_interval_create_from_date_string('1 day')), 'Y-m-d');
     }
 
-    $allMeasurements = $patient->measurements->toArray();
+    $allMeasurements = $patient->nonZeroMeasurements->toArray();
 
     $bpData = [];
     $weightData = [];
@@ -91,7 +91,7 @@
 
         // weight
         $weight = array_filter($allMeasurements, function($_measurement) use ($date) {
-            return $_measurement['label'] === 'Wt. (lbs.)' && $_measurement['effective_date'] === $date && !!$_measurement['numeric_value']; 
+            return $_measurement['label'] === 'Wt. (lbs.)' && $_measurement['effective_date'] === $date && !!$_measurement['numeric_value'];
         });
         if(count($weight)) {
             $weight = array_values($weight);