Explorar o código

Merge branch 'master' into dev-vj

Vijayakrishnan %!s(int64=4) %!d(string=hai) anos
pai
achega
9c88757475
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      resources/views/app/patient/measurements.blade.php

+ 2 - 2
resources/views/app/patient/measurements.blade.php

@@ -60,8 +60,8 @@
                         @if(!in_array($measurement->label, ["SBP", "DBP"]))
                         <tr>
                             <td class="px-2">
-                                @if($measurement->client_bdt_measurement_id)
-                                    <?php $timestampInSec = floor($measurement->bdt_measurement_timestamp/1000); ?>
+                                @if($measurement->ts)
+                                    <?php $timestampInSec = floor($measurement->ts/1000); ?>
                                     {{ friendly_date_time_short_with_tz_from_timestamp($timestampInSec, 'EASTERN') }}
                                 @else
                                     {{ friendly_date_time_short_with_tz($measurement->effective_date, true, 'EASTERN') }}