Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

resources/views/app/patient/vitals-settings/bmi-management-summary.blade.php

@@ -11,7 +11,9 @@
     <div class="ml-2">
       @if($patient->usual_weight_in_pounds_min)
         <b>{{$patient->usual_weight_in_pounds_min}}</b>
+        @if($patient->usual_weight_in_pounds_max)
         - <b>{{$patient->usual_weight_in_pounds_max}}</b>
+        @endif
       @else
       <span>-</span>
       @endif
@@ -23,7 +25,9 @@
     <div class="ml-2">
       @if($patient->usual_bmi_min)
         <span class="text-nowrap"><b>{{$patient->usual_bmi_min}}</b> {{$patient->usual_bmi_min_category}}</span>
+        @if($patient->usual_bmi_max)
         - <span class="text-nowrap"><b>{{$patient->usual_bmi_max}}</b> {{$patient->usual_bmi_max_category}}</span>
+        @endif
       @else
       <span>-</span>
       @endif

resources/views/app/patient/vitals-settings/bp-management-form.blade.php

@@ -20,7 +20,7 @@
                                 <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMin" value="{{ $patient->usual_am_resting_sbp_min }}" />
                                 <span>/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="usualAmRestingDbpMin" value="{{ $patient->usual_am_resting_dbp_min }}" />
-                                <span>mm Hg Pulse:</span>
+                                <span>Pulse:</span>
                                 <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMin" value="{{ $patient->usual_am_resting_pulse_min }}" />
                                 <span>BPM</span>
                             </div>
@@ -31,7 +31,7 @@
                                 <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMax" value="{{ $patient->usual_am_resting_sbp_max }}" />
                                 <span>/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="usualAmRestingDbpMax" value="{{ $patient->usual_am_resting_dbp_max }}" />
-                                <span>mm Hg Pulse:</span>
+                                <span>Pulse:</span>
                                 <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMax" value="{{ $patient->usual_am_resting_pulse_max }}" />
                                 <span>BPM</span>
                             </div>
@@ -47,7 +47,7 @@
                                     <input type="text" class="inline-input-underlined width-50" name="usualPmRestingSbpMin" value="{{ $patient->usual_pm_resting_sbp_min }}" />
                                     <span>/</span>
                                     <input type="text" class="inline-input-underlined width-50 mr-3" name="usualPmRestingDbpMin" value="{{ $patient->usual_pm_resting_dbp_min }}" />
-                                    <span>mm Hg Pulse:</span>
+                                    <span>Pulse:</span>
                                     <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMin" value="{{ $patient->usual_pm_resting_pulse_min }}" />
                                     <span>BPM</span>
                                 </div>
@@ -57,7 +57,7 @@
                                     <input type="text" class="inline-input-underlined width-50" name="usualPmRestingSbpMax" value="{{ $patient->usual_pm_resting_sbp_max }}" />
                                     <span>/</span>
                                     <input type="text" class="inline-input-underlined width-50 mr-3" name="usualPmRestingDbpMax" value="{{ $patient->usual_pm_resting_dbp_max }}" />
-                                    <span>mm Hg Pulse:</span>
+                                    <span>Pulse:</span>
                                     <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMax" value="{{ $patient->usual_pm_resting_pulse_max }}" />
                                     <span>BPM</span>
                                 </div>
@@ -87,7 +87,7 @@
                             <input type="text" class="inline-input-underlined width-50" name="idealAmRestingSbpMin" value="{{ $patient->ideal_am_resting_sbp_min }}" />
                             <span>/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="idealAmRestingDbpMin" value="{{ $patient->ideal_am_resting_dbp_min }}" />
-                            <span>mm Hg Pulse:</span>
+                            <span>Pulse:</span>
                             <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" />
                             <span>BPM</span>
                         </div>
@@ -102,7 +102,7 @@
                             <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpAbove" value="{{ $patient->red_alert_when_sbp_above }}" />
                             <span>/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpAbove" value="{{ $patient->red_alert_when_dbp_above }}" />
-                            <span>mm Hg Pulse:</span>
+                            <span>Pulse:</span>
                             <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" />
                             <span>BPM</span>
                         </div>
@@ -112,7 +112,7 @@
                             <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpBelow" value="{{ $patient->red_alert_when_sbp_below }}" />
                             <span>/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpBelow" value="{{ $patient->red_alert_when_dbp_below }}" />
-                            <span>mm Hg Pulse:</span>
+                            <span>Pulse:</span>
                             <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" />
                             <span>BPM</span>
                         </div>
@@ -125,7 +125,7 @@
                             <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpAbove" value="{{ $patient->yellow_alert_when_sbp_above }}" />
                             <span>/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpAbove" value="{{ $patient->yellow_alert_when_dbp_above }}" />
-                            <span>mm Hg Pulse:</span>
+                            <span>Pulse:</span>
                             <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" />
                             <span>BPM</span>
                         </div>
@@ -135,7 +135,7 @@
                             <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpBelow" value="{{ $patient->yellow_alert_when_sbp_below }}" />
                             <span>/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpBelow" value="{{ $patient->yellow_alert_when_dbp_below }}" />
-                            <span>mm Hg Pulse:</span>
+                            <span>Pulse:</span>
                             <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" />
                             <span>BPM</span>
                         </div>