浏览代码

Merge branch 'dev' into dev-vj

Vijayakrishnan 3 年之前
父节点
当前提交
10ff7e57d3

+ 1 - 6
app/Models/Client.php

@@ -813,12 +813,7 @@ ORDER BY m.ts DESC
 
     public function getPrimaryCoverage()
     {
-        // try the latest manual coverage
-        $coverage = $this->latestManualClientPrimaryCoverage;
-        if (!$coverage) {
-            // try the latest coverage
-            $coverage = $this->latestClientPrimaryCoverage;
-        }
+        $coverage = $this->latestClientPrimaryCoverage;
         return $coverage;
     }
 

+ 1 - 0
resources/views/app/dashboard-mcp.blade.php

@@ -235,6 +235,7 @@
                                     <th class="font-weight-normal pl-2"><a
                                             href="/practice-management/bills-under-processing">Processing</a></th>
                                 </tr>
+{{--
                                 <tr class="thin">
                                     <th class="font-weight-normal px-2 pl-5">
                                         ${{friendly_money($reimbursement['nextPaymentAmount'])}}</th>

+ 7 - 9
resources/views/app/mcp/dashboard/appointments.blade.php

@@ -3,23 +3,21 @@
     <tr v-for="event in events" class="">
         <td>
             <a :href="'/patients/view/' + event.clientUid" class="font-weight-bold">@{{
-                event.clientName }}</a>
-        </td>
-        <td>
+                event.clientName }}</a><br/>
             {{-- <span class="small d-inline-block text-secondary font-weight-normal"> (@{{ event.clientAge }} y.o. @{{event.clientSex}})</span>--}}
             @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }} <span
                 class="text-secondary">@{{ formatTimeZone(event.timezone) }}</span>
-            <span v-if="event.title"
-                  class="d-inline-block ml- 2 text-secondary font-weight-bold">
-                                                      &nbsp;/&nbsp;
-                                                  @{{ event.title }}
-                                                  </span>
             <a :href="'/patients/view/' + event.clientUid + '/calendar/' + event.uid">
                 <i class="fa fa-edit"></i>
             </a>
+
+            <br/><span v-if="event.title"
+                  class="d-inline-block ml- 2 text-secondary font-weight-bold">
+                                                  @{{ event.title }}
+                                                  </span>
         </td>
         <td>
-            <div class="d-flex align-items-baseline">
+            <div class="d-flexi align-items-baseline">
                 <!-- <div v-if="event.status === 'CREATED'"
                      class="text-warning-mellow font-weight-bold">
                     <i class="fa fa-exclamation-triangle"></i>

+ 1 - 1
resources/views/app/mcp/dashboard/measurements.blade.php

@@ -1 +1 @@
-Measurements
+No measurement alerts

+ 1 - 1
resources/views/app/mcp/dashboard/messages.blade.php

@@ -1 +1 @@
-<h1>Messages</h1>
+<h1>No messages</h1>

+ 5 - 1
resources/views/app/mcp/measurements_pending_stamping.blade.php

@@ -23,7 +23,11 @@
                 @foreach($records as $row)
                     <tr>
                         <td>
-                            <b>{{$row->patient->displayName()}}</b>
+                            <b>
+				<a href="{{ route('patients.view.dashboard', $row->patient) }}">
+					{{$row->patient->displayName()}}
+				</a>
+			    </b>
                         </td>
                         <td>
                             <a native target="_blank"

+ 3 - 3
resources/views/app/patient/notes.blade.php

@@ -6,9 +6,9 @@
     <div class="pt-2 d-flex align-items-start">
         <h6 class="my-0 text-secondary d-flex align-items-center w-100">
             <span class="font-weight-bold text-secondary">Notes</span>
-            @if($patient->getPrimaryCoverageStatus() === 'YES')
+            @if($patient->latestClientPrimaryCoverage->is_covered == 'YES')
                 <span class="mx-2 text-secondary">|</span>
-                {{--
+
                 <div moe>
                     <a start show class="py-0 mb-3">Add</a>
 
@@ -61,7 +61,7 @@
                     </form>
                 </div>
                 <span class="mx-2 text-secondary">|</span>
-                --}}
+
                 <div moe>
                 <a start show class="py-0 mb-3 text-info font-weight-bold">Add Visit</a>
                 <form url="/api/visit/create"

+ 1 - 0
resources/views/app/patient/primary-coverage.blade.php

@@ -26,6 +26,7 @@
             $cpc->auto_detail_json = json_decode($cpc->auto_detail_json);
         @endphp
         <div class="d-flex mb-2">
+            <h1>Is Covered: {{$cpc->is_covered}}</h1>
             @if($cpc->plan_type == 'MEDICARE')
                 @include('app.patient.primary-coverage-refresh', ['endpoint'=>'refreshCoverageForMedicare'])
                 <span class="mx-2 text-secondary text-sm">|</span>

+ 3 - 14
resources/views/app/patient/vitals-settings/bmi-management-form.blade.php

@@ -14,11 +14,7 @@
 
         <div class="mb-1 d-flex align-items-center">
             <span class="text-secondary min-width-140px">Weight (usual):</span>
-            <div class="width-100px mr-2"><?= vsElement('usual_weight_in_pounds', 'number', 'usualWeightInPounds', $patient) ?></div>
-            <span class="text-secondary">(lbs)</span>
-        </div>
-        <div class="mb-1 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Ranging between</span>
+            <span class="text-secondary">Ranging between: </span>
             <div class="width-100px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
             <span class="text-secondary mx-2">and</span>
             <div class="width-100px"><?= vsElement('usual_weight_in_pounds_max', 'number', 'usualWeightInPoundsMax', $patient) ?></div>
@@ -39,13 +35,6 @@
         <div class="mb-1 d-flex align-items-center">
             <span class="text-secondary min-width-140px">Weight (ideal):</span>
             <div class="width-100px mr-2"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
-            <span class="text-secondary">(lbs)</span>
-        </div>
-        <div class="mb-1 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Ranging between</span>
-            <div class="width-100px"><?= vsElement('ideal_weight_in_pounds_min', 'number', 'idealWeightInPoundsMin', $patient) ?></div>
-            <span class="text-secondary mx-2">and</span>
-            <div class="width-100px"><?= vsElement('ideal_weight_in_pounds_max', 'number', 'idealWeightInPoundsMax', $patient) ?></div>
         </div>
         <div class="mb-3 d-flex align-items-center">
             <span class="text-secondary min-width-140px">BMI (ideal):</span>
@@ -85,7 +74,7 @@
         </div>
 
         <div class="mb-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px mr-2">Weight monitoring prescribed?</span>
+            <span class="text-secondary min-width-140px mr-2"><b>Monitoring prescribed?</b> </span>
             <div class="width-150px">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isWeightMonitoringNeeded">
                     <option value="">-- select --</option>
@@ -176,4 +165,4 @@
         addMCInitializer('bmi-management-settings', init, '#bmi-management-settings');
 
     }).call(window);
-</script>
+</script>

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

@@ -13,7 +13,6 @@
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">SBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_sbp', 'number', 'usualAmRestingSbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_sbp_min', 'number', 'usualAmRestingSbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -21,7 +20,6 @@
                 </div>
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">DBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_dbp', 'number', 'usualAmRestingDbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_dbp_min', 'number', 'usualAmRestingDbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -29,7 +27,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-70px">Pulse:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_pulse', 'number', 'usualAmRestingPulse', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_pulse_min', 'number', 'usualAmRestingPulseMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -45,7 +42,6 @@
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">SBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_sbp', 'number', 'usualPmRestingSbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_sbp_min', 'number', 'usualPmRestingSbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -53,7 +49,6 @@
                 </div>
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">DBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_dbp', 'number', 'usualPmRestingDbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_dbp_min', 'number', 'usualPmRestingDbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -61,7 +56,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-70px">Pulse:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_pulse', 'number', 'usualPmRestingPulse', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_pulse_min', 'number', 'usualPmRestingPulseMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -77,13 +71,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">SBP:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_sbp', 'number', 'idealAmRestingSbp', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_sbp_min', 'number', 'idealAmRestingSbpMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_sbp_max', 'number', 'idealAmRestingSbpMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="sbpManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -96,13 +84,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">DBP:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_dbp', 'number', 'idealAmRestingDbp', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_dbp_min', 'number', 'idealAmRestingDbpMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_dbp_max', 'number', 'idealAmRestingDbpMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="dbpManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -115,13 +97,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">Pulse:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_pulse', 'number', 'idealAmRestingPulse', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_pulse_min', 'number', 'idealAmRestingPulseMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_pulse_max', 'number', 'idealAmRestingPulseMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="pulseManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -143,20 +119,20 @@
             </div>
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">SBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_sbp_above', 'number', 'redAlertWhenSbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">SBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"> <?= vsElement('red_alert_when_sbp_above', 'number', 'redAlertWhenSbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_sbp_below', 'number', 'redAlertWhenSbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">DBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_dbp_above', 'number', 'redAlertWhenDbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">DBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"> <?= vsElement('red_alert_when_dbp_above', 'number', 'redAlertWhenDbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_dbp_below', 'number', 'redAlertWhenDbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">Pulse: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_above', 'number', 'redAlertWhenPulseAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">Pulse: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_above', 'number', 'redAlertWhenPulseAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_below', 'number', 'redAlertWhenPulseBelow', $patient) ?></div>
                 </div>
@@ -169,20 +145,20 @@
             </div>
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">SBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_above', 'number', 'yellowAlertWhenSbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">SBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_above', 'number', 'yellowAlertWhenSbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_below', 'number', 'yellowAlertWhenSbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">DBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_above', 'number', 'yellowAlertWhenDbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">DBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_above', 'number', 'yellowAlertWhenDbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_below', 'number', 'yellowAlertWhenDbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">Pulse: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_above', 'number', 'yellowAlertWhenPulseAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">Pulse: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_above', 'number', 'yellowAlertWhenPulseAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_below', 'number', 'yellowAlertWhenPulseBelow', $patient) ?></div>
                 </div>
@@ -202,7 +178,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Reports hypertension?</span>
+            <span class="text-secondary min-width-140px w-50">Reports HTN?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="hasHypertensionDx">
                     <option value="">-- select --</option>
@@ -213,7 +189,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Reports hypertension medicine?</span>
+            <span class="text-secondary min-width-140px w-50">Reports HTN medicine?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isPrescribedHypertensionMedicine">
                     <option value="">-- select --</option>
@@ -224,7 +200,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Is it a goal to reduce<br>hypertension medicine?</span>
+            <span class="text-secondary min-width-140px w-50">Goal to reduce HTN medicine?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isGoalToReduceHypertensionMedicine">
                     <option value="">-- select --</option>
@@ -239,7 +215,9 @@
         <input type="text" class="form-control form-control-sm min-width-unset" name="goalToReduceHypertensionMedicineMemo" value="{{$patient->goal_to_reduce_hypertension_medicine_memo}}">
 
         <div class="my-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px w-50">BP monitoring prescribed?</span>
+            <span class="text-secondary min-width-140px w-50">
+                <strong>BP monitoring prescribed?</strong>
+            </span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isBpMonitoringNeeded">
                     <option value="">-- select --</option>
@@ -329,4 +307,4 @@
         addMCInitializer('bp-management-settings', init, '#bp-management-settings');
 
     }).call(window);
-</script>
+</script>

+ 1 - 19
resources/views/app/patient/vitals-settings/bp-management-summary.blade.php

@@ -9,7 +9,6 @@
             <div class="">
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">SBP:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_am_resting_sbp', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_am_resting_sbp_min', $patient) ?>
                     to
@@ -17,7 +16,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">DBP:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_am_resting_dbp', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_am_resting_dbp_min', $patient) ?>
                     to
@@ -25,7 +23,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">Pulse:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_am_resting_pulse', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_am_resting_pulse_min', $patient) ?>
                     to
@@ -41,7 +38,6 @@
             <div class="">
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">SBP:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_pm_resting_sbp', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_pm_resting_sbp_min', $patient) ?>
                     to
@@ -49,7 +45,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">DBP:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_pm_resting_dbp', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_pm_resting_dbp_min', $patient) ?>
                     to
@@ -57,7 +52,6 @@
                 </div>
                 <div class="d-flex align-items-center">
                     <span class="text-secondary width-50px">Pulse:</span>
-                    <div class="px-2 font-weight-bold"><?= vsValue('usual_pm_resting_pulse', $patient) ?></div>
                     <span class="text-secondary">(range
                     <?= vsValue('usual_pm_resting_pulse_min', $patient) ?>
                     to
@@ -73,10 +67,6 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">SBP:</span>
                     <div class="font-weight-bold"><?= vsValue('ideal_am_resting_sbp', $patient) ?></div>
-                    <span class="text-secondary">(range
-                    <?= vsValue('ideal_am_resting_sbp_min', $patient) ?>
-                    to
-                    <?= vsValue('ideal_am_resting_sbp_max', $patient) ?>)</span>
                 </div>
                 <div class="mb-3 d-flex align-items-center">
                     <span class="text-secondary width-50px">Goal: &nbsp;</span>
@@ -87,10 +77,6 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">DBP:</span>
                     <div class="font-weight-bold"><?= vsValue('ideal_am_resting_dbp', $patient) ?></div>
-                    <span class="text-secondary">(range
-                    <?= vsValue('ideal_am_resting_dbp_min', $patient) ?>
-                    to
-                    <?= vsValue('ideal_am_resting_dbp_max', $patient) ?>)</span>
                 </div>
                 <div class="mb-3 d-flex align-items-center">
                     <span class="text-secondary width-50px">Goal: &nbsp;</span>
@@ -101,10 +87,6 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-50px">Pulse:</span>
                     <div class="font-weight-bold"><?= vsValue('ideal_am_resting_pulse', $patient) ?></div>
-                    <span class="text-secondary">(range
-                    <?= vsValue('ideal_am_resting_pulse_min', $patient) ?>
-                    to
-                    <?= vsValue('ideal_am_resting_pulse_max', $patient) ?>)</span>
                 </div>
                 <div class="mb-3 d-flex align-items-center">
                     <span class="text-secondary width-50px">Goal: &nbsp;</span>
@@ -255,4 +237,4 @@
     $icds = implode(', ', $icds);
     ?>
     <span>{{$icds}}</span>
-</div>
+</div>

+ 0 - 4
resources/views/layouts/patient.blade.php

@@ -246,10 +246,6 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                             <a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
                         </li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.client-primary-coverages') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.client-primary-coverages', $patient) }}">Client Primary Coverage</a>
-						</li>
 						<li class="nav-item">
 							<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}"
 							   href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>