= 1 anno fa
parent
commit
81fb94356f

+ 6 - 6
resources/views/app/patient/segment-templates/omega_vitals/edit.blade.php

@@ -73,8 +73,8 @@ foreach ($previousVitals as $p) {
             }
         }
         $newFormat['date'] = $p->note->effective_dateest; // unfriendly_date($p->created_at);
+        $previousData[] = $newFormat;
         if(!isset($previousDataAssoc[$newFormat['date']])){
-            $previousData[] = $newFormat;
             $previousDataAssoc[$newFormat['date']] = $newFormat; // for easy iter to cols
         }
     }
@@ -197,13 +197,13 @@ if(!@$segment) {
                                 <td class="bg-light {{!isset($copyTriggerAdded[$k]) ? 'px-2' : 'px-2'}} py-1 text-secondary position-relative">
                                     <span data-type="{{$k}}">
                                     @if($k === 'systolicBP')
-                                        {{ @$previousDataAssoc[$pDay['date']]['systolicBP'] ?: '-' }}/{{ @$previousDataAssoc[$pDay['date']]['diastolicBP'] ?: '-' }}
+                                        {{ @$pDay['systolicBP'] ?: '-' }}/{{ @$pDay['diastolicBP'] ?: '-' }}
                                     @elseif($k === 'heightInInches')
-                                        {{$previousDataAssoc[$pDay['date']][$k] ? toFeetAndInches($previousDataAssoc[$pDay['date']][$k]) : '-' }}
+                                        {{$pDay[$k] ? toFeetAndInches($pDay[$k]) : '-' }}
                                     @elseif($k === 'bmi')
-                                        {{$previousDataAssoc[$pDay['date']][$k] ?: '-' }}
+                                        {{$pDay[$k] ?: '-' }}
                                         <?php
-                                        $prevBMI = $previousDataAssoc[$pDay['date']][$k] ? +($previousDataAssoc[$pDay['date']][$k]) : false;
+                                        $prevBMI = $pDay[$k] ? +($pDay[$k]) : false;
                                         ?>
                                         @if($prevBMI < 18.5)
                                             <span class="text-sm text-warning-mellow ml-1">Underweight</span>
@@ -218,7 +218,7 @@ if(!@$segment) {
                                             <span class="text-sm text-warning-mellow ml-1">Obese</span>
                                         @endif
                                     @else
-                                        {{$previousDataAssoc[$pDay['date']][$k] ?: '-' }}
+                                        {{$pDay[$k] ?: '-' }}
                                     @endif
                                     </span>
                                     @if(!isset($copyTriggerAdded[$k]) && $k !== "bmi")