Merge branch 'master' of https://rav.triplestart.com/jmudaka/stagfe2

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

@@ -91,7 +91,7 @@
 
         // weight
         $weight = array_filter($allMeasurements, function($_measurement) use ($date) {
-            return $_measurement['label'] === 'WEIGHT' && $_measurement['effective_date'] === $date;
+            return $_measurement['label'] === 'Wt. (lbs.)' && $_measurement['effective_date'] === $date && !!$_measurement['numeric_value']; 
         });
         if(count($weight)) {
             $weight = array_values($weight);