Merge branch 'dev' into dev-vj

resources/views/app/patient/partials/vitals.blade.php

@@ -15,23 +15,7 @@ $vitalMap = [
 
 $vitalLabels = ['Ht. (in.)','Wt. (lbs.)','Temp. (F)','Pulse','Resp.','Pulse Ox.','SBP','DBP','Smoking Status', 'BMI'];
 
-$vitalValues = [];
-
-foreach($vitalLabels as $l){
-    $vitalValues[$l] = [
-        'value' => null,
-        'effectiveDate' => null
-    ];
-}
-
-foreach($patient->measurements as $measurement) {
-    if(!empty($measurement->label) && in_array($measurement->label, $vitalLabels)){
-        $vitalValues[$measurement->label] = [
-            'value'=>$measurement->value,
-            'effectiveDate' => $measurement->effective_date
-        ];
-    }
-}
+$vitalValues = json_decode($patient->latest_measurements, true);
 
 ?>