Bläddra i källkod

Merge branch 'cleanup' of https://rav.triplestart.com/tigerphp/stagfe2 into cleanup

root 1 år sedan
förälder
incheckning
8ab0f30dfa

+ 3 - 2
app/Models/Point.php

@@ -290,7 +290,7 @@ class Point extends Model
     }
 
     public static function getPlanPoints(Client $_patient, Note $_note, $_assoc = false) {
-        
+
 	$points = Point
             ::where('client_id', $_patient->id)
             ->where('is_removed_due_to_entry_error', false)
@@ -494,6 +494,7 @@ class Point extends Model
             ->where('intention', 'TOP_LEVEL')
             ->first();
 
+
         if(!$point) {
             $response = callJava('/visitPoint/addTopLevel', [
                 "category" => $_category,
@@ -555,5 +556,5 @@ class Point extends Model
 
         return $point;
     }
-    
+
 }

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

@@ -50,9 +50,10 @@ $previousVitals = [];
 $previousVitals = \App\Models\Point::where('parent_point_id', $point->id)
     ->where('category', 'REVIEW')
     ->whereIn('added_in_note_id', $last4VisitsIDs)
-    ->orderBy('id', 'DESC')
+    ->orderBy('id', 'ASC')
     ->get();
 
+
 // convert to new format
 $previousData = [];
 $previousDataAssoc = [];
@@ -74,8 +75,8 @@ foreach ($previousVitals as $p) {
         $newFormat['date'] = $p->note->effective_dateest; // unfriendly_date($p->created_at);
         if(!isset($previousDataAssoc[$newFormat['date']])){
             $previousData[] = $newFormat;
-            $previousDataAssoc[$newFormat['date']] = $newFormat; // for easy iter to cols 
-        }        
+            $previousDataAssoc[$newFormat['date']] = $newFormat; // for easy iter to cols
+        }
     }
 }
 

+ 1 - 0
resources/views/app/patient/segment-templates/omega_vitals/summary.blade.php

@@ -47,6 +47,7 @@ if(!$contentData) {
 
 {{--<div class="mb-2">Effective Date: <b>{{friendly_date($contentData['date'])}}</b></div>--}}
 <div class="d-flex flex-wrap">
+
 @foreach ($vitalLabels as $k => $v)
     @if($k !== 'diastolicBP')
         <div class="d-inline-flex vital-item align-items-center mr-3 mb-1">