Merge branch 'dev' into dev-vj

app/Http/Controllers/DnaController.php

@@ -288,6 +288,25 @@ class DnaController extends Controller
         $records = $pro->supplyOrdersPendingHcpApprovalRecordsAsDna();
         return view('app.dna.dashboard.supply_orders_pending_hcp_approval', compact('records'));
     }
+
+    public function teamDashboard(ProTeam $team){
+        $slug = $team->slug ?? $team->uid;
+        $url = config('app.stagfe6_url') . '/flyers/json-list?slug=' . $slug;
+
+        $arrContextOptions=array(
+            "ssl"=>array(
+                "verify_peer"=>false,
+                "verify_peer_name"=>false,
+            ),
+        );        
+        $response = @file_get_contents($url, false, stream_context_create($arrContextOptions));
+        $response = @json_decode($response);
+        $flyerTemplates = [];
+        if(isset($response->data)){
+            $flyerTemplates = $response->data;
+        }
+        return view('app.dna.teams.dashboard', compact('team','flyerTemplates'));
+    }
     
 
 }

app/Http/Controllers/PatientController.php

@@ -13,6 +13,7 @@ use App\Models\CompanyPro;
 use App\Models\Erx;
 use App\Models\Facility;
 use App\Models\Handout;
+use App\Models\HandoutClient;
 use App\Models\IncomingReport;
 use App\Models\MBClaim;
 use App\Models\MBPayer;
@@ -328,8 +329,9 @@ class PatientController extends Controller
 
     public function handouts(Request $request, Client $patient )
     {
+        $clientHandouts = HandoutClient::where('client_id', $patient->id)->get();
         $handouts = Handout::where('is_active', true)->get();
-        return view('app.patient.handouts', compact('patient', 'handouts'));
+        return view('app.patient.handouts', compact('patient', 'clientHandouts', 'handouts'));
     }
 
     public function settings(Request $request, Client $patient )

app/Models/Client.php

@@ -200,14 +200,15 @@ class Client extends Model
             $mappings = $mappings->where('note_id', $note->id);
         }
         $mappings = $mappings->get();
-        $handouts = new Collection();
-        foreach ($mappings as $mapping) {
-            $handout = Handout::where('id', $mapping->handout_id)->first();
-            $handout->handout_client_uid = $mapping->uid;
-            $handouts->add($handout);
-        }
-        $handouts = $handouts->sortBy('created_at');
-        return $handouts;
+        return $mappings;
+        // $handouts = new Collection();
+        // foreach ($mappings as $mapping) {
+        //     $handout = Handout::where('id', $mapping->handout_id)->first();
+        //     $handout->handout_client_uid = $mapping->uid;
+        //     $handouts->add($handout);
+        // }
+        // $handouts = $handouts->sortBy('created_at');
+        // return $handouts;
     }
 
     public function duplicateOf()

app/Models/HandoutClient.php

@@ -8,4 +8,12 @@ class HandoutClient extends Model
 {
     protected $table = 'handout_client';
 
+    public function client(){
+        return $this->hasOne(Client::class, 'id', 'client_id');
+    }
+
+    public function handout(){
+        return $this->hasOne(Handout::class, 'id', 'handout_id');
+    }
+
 }

public/css/style.css

@@ -50,6 +50,7 @@
 .text-link {
     color: rgb(13, 89, 175) !important;
 }
+
 .stag-primary-bg {
   background-color: var(--primary-color) !important;
   color: #fff;
@@ -339,10 +340,17 @@ body>nav.navbar {
     left: calc(50% - 400px);
     width: 800px;
 }
+[moe][center][extra-wide] [url]:not([show]) {
+    left: calc(50% - 500px);
+    width: 1000px;
+}
 [moe][center] [url]:not([show]) .form-control.form-control-sm {
     min-width: unset;
     max-width: 100%;
 }
+.form-check-label {
+  padding-top: 2px;
+}
 .mcp-theme-1 .rotateh {
     transform: rotateY(180deg);
 }
@@ -620,6 +628,34 @@ input.search_field, textarea.search_field {
         padding-top: 55px;
     }
 }
+.flex-parent-container {
+  display: flex;
+  align-items: flex-start;
+}
+.flex-parent-container > div:first-child {
+  border-right: 1px solid #eee !important;
+  margin-right: 10px;
+}
+.flex-parent-container > div {
+  flex-basis: 50%;
+}
+@media screen and (min-width: 1400px) {
+  .flex-container, .flex-parent-container {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+  }
+  .flex-container >div {
+    flex-basis: 50%;
+  }
+  .flex-parent-container > div:first-child {
+    flex-basis: 40%;
+  }
+  .flex-parent-container > div {
+    flex-basis: 60%;
+  }
+}
+
 .main-row > .sidebar .nav .nav-item a {
     white-space: nowrap;
 }
@@ -2545,7 +2581,7 @@ td.row-selection-highlight:after {
     max-height: 14px;
 }
 
-.table td.fit, 
+.table td.fit,
 .table th.fit {
     white-space: nowrap;
     width: 1%;

resources/views/app/dna/my-clinical-teams.blade.php

@@ -28,7 +28,7 @@
                 <tbody>
                     @foreach($teams as $team)
                     <tr>
-                        <td>{{ $team->internal_name }}</td>
+                        <td><a href="{{ route('dna.my-clinical-teams.view.team-dashboard', $team) }}">{{ $team->internal_name }}</a></td>
                         <td></td>
                         <td></td>
                         <td></td>

resources/views/app/dna/teams/dashboard.blade.php

@@ -0,0 +1,40 @@
+@extends('app.dna.teams.single')
+@section('inner-content')
+
+<div class="card">
+
+	<div class="card-header px-3 py-2 d-flex align-items-center">
+		<strong class="text-nowrap">
+			<i class="fas fa-clipboard"></i>
+			Team Flyers
+		</strong>
+	</div>
+	<div class="card-body p-0">
+
+		<table class="table table-sm table-striped p-0 m-0">
+			<thead class="bg-light">
+				<tr>
+					<th class="border-0">Title</th>
+					<th class="border-0">template</th>
+					<th class="border-0">url</th>
+					<th class="border-0">Status</th>
+					<th class="border-0">&nbsp;</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach($flyerTemplates as $flyer)
+				<tr>
+					<td>{{ $flyer->title }}</td>
+					<td>{{ $flyer->template }}</td>
+					<td><a href="{{ $flyer->url }}" target="_blank" native>{{ $flyer->url }}</a></td>
+					<td>{{ $flyer->active ? 'ACTIVE':'INACTIVE' }}</td>
+					<td></td>
+				</tr>
+				@endforeach
+			</tbody>
+		</table>
+	</div>
+</div>
+
+
+@endsection

resources/views/app/dna/teams/single.blade.php

@@ -0,0 +1,91 @@
+@extends(request()->input('popupmode') ? 'layouts.empty' : 'layouts.template')
+<?php
+$routeName = request()->route()->getName();
+?>
+@section('content')
+<div class="container-fluid h-100 popup-content-container">
+	<div class="main-row h-100">
+		<nav id="sidebarMenu" class="d-block bg-light sidebar collapse px-0">
+			<div class="sidebar-sticky pt-3">
+				<ul class="nav flex-column mcp-theme-1">
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'dna.my-clinical-teams.view.team-dashboard') === 0 ? 'active' : '' }}" href="{{ route('dna.my-clinical-teams.view.team-dashboard', $team) }}">Dashboard</a>
+					</li>
+				</ul>
+				<div class="mt-3 mcp-theme-1">
+					@yield('left-nav-content')
+				</div>
+			</div>
+		</nav>
+		<main role="main" class="w-100 p-0">
+			<div class="card card m-0 rounded-0" id="patient-header">
+				<div id="patient-header-content">
+					<div class="card-header  py-1 hide-inside-ticket-popup">
+						<div class="z">
+							<div class=header>
+
+								<div class="hbox mr-auto">
+									<section>
+										<div class="hbox">
+											<h4 class="pt-name">{{ $team->internal_name }}</h4>
+											<div class="d-inline-flex align-items-baseline">
+												<i class="chart mr-2">{{ $team->slug }}</i>
+												<span class="on-hover-show d-inline-block on-hover-opaque">
+													<i class="fa fa-info-circle ml-1 text-primary"></i>
+													<div class="on-hover-content py-2 pl-3 text-nowrap">
+														{{ $team->web_display_name }}
+													</div>
+												</span>
+											</div>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Url:</b></span>
+											<a native target="_blank" href="{{config('app.stagfe6_url') . '/' . $team->slug}}">{{ $team->slug }}</a>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Pro:</b></span>
+											<span>{{ $team->mcp ? $team->mcp->displayName() : '---' }}</span>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Assistant:</b></span>
+											<span>{{ $team->assistant ? $team->assistant->displayName() : '---' }}</span>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>RD:</b></span>
+											<span>{{ $team->rd ? $team->rd->displayName() : '---' }}</span>
+										</div>
+									</section>
+									<section>
+										<div class="hbox">
+											<span class="mr-2"><b>Web Display Email:</b></span>
+											<span>{{ $team->web_display_email_address ?? '---' }}</span>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Web Display Name:</b></span>
+											<span>{{ $team->web_display_name ?? '---' }}</span>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Web Display Phone:</b></span>
+											<span>{{ $team->web_display_phone_number ?? '---' }}</span>
+										</div>
+										<div class="hbox">
+											<span class="mr-2"><b>Web Display Title:</b></span>
+											<span>{{ $team->web_display_title ?? '---' }}</span>
+										</div>
+									</section>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="card-body">
+					<div class="mcp-theme-1">
+						@yield('inner-content')
+					</div>
+				</div>
+			</div>
+		</main>
+	</div>
+</div>
+
+@endsection

resources/views/app/patient/handouts-list.blade.php

@@ -37,15 +37,15 @@
         </tr>
         </thead>
         <tbody>
-        @foreach($handouts as $handout)
-            <?php $downloadLink = config('app.url') . "/guest/handout/{$handout->handout_client_uid}"; ?>
+        @foreach($clientHandouts as $clientHandout)            
+            <?php $downloadLink = config('app.url') . "/guest/handout/".$clientHandout->uid; ?>
             <tr>
-                <td>{{$handout->internal_name}}</td>
-                <td>{{$handout->display_name}}</td>
+                <td>{{$clientHandout->handout->internal_name}}</td>
+                <td>{{$clientHandout->handout->display_name}}</td>
                 <td>
-                    <a native href="{{ $downloadLink }}" target="_blank" class="pdf-viewer-triggerd-flex align-items-center">
-                        <i class="fa fa-eye mr-2"></i>View
-                    </a>
+                    <a class="pdf-viewer-trigger" native target="_blank"
+                               href="/api/handout/download/{{ $clientHandout->handout->uid }}"
+                               title="View">View</a>
                 </td>
                 <td><b class="click-to-copy">{{ $downloadLink }}</b></td>
                 <td>
@@ -59,7 +59,7 @@
                             </div>
                             <div class="mb-2">
                                 <label for="" class="text-sm text-secondary mb-1">Message</label>
-                                <textarea type="text" rows="10" class="form-control form-control-sm" name="message">Dear {{$patient->displayName()}}, Access the handout ({{$handout->display_name}}) at the following link: <a href="{{$downloadLink}}">{{$downloadLink}}</a></textarea>
+                                <textarea type="text" rows="10" class="form-control form-control-sm" name="message">Dear {{$patient->displayName()}}, Access the handout ({{$clientHandout->handout->display_name}}) at the following link: <a href="{{$downloadLink}}">{{$downloadLink}}</a></textarea>
                             </div>
                             <div class="d-flex align-items-center">
                                 <button class="btn btn-sm btn-primary mr-2" submit="">Send</button>

resources/views/app/patient/note/dashboard.blade.php

@@ -1,5 +1,8 @@
 <?php
 /** @var App\Models\Note $note */
+
+use App\Models\Handout;
+
 /** @var App\Models\Pro $pro */
 /** @var App\Models\Section $section */
 /** @var $allSections */
@@ -797,8 +800,11 @@
 
                 <!-- handouts -->
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="Handouts">
-                    <?php $handouts = $patient->handouts($note); ?>
-                    @include('app.patient.handouts-list', compact('patient', 'handouts', 'note'))
+                    <?php 
+                        $handouts = Handout::where('is_active', true)->get();
+                        $clientHandouts = $patient->handouts($note); 
+                    ?>
+                    @include('app.patient.handouts-list', compact('patient', 'clientHandouts', 'handouts', 'note'))
                 </div>
 
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="Prescriptions">
@@ -945,7 +951,7 @@
                         <p class="font-weight-bold text-secondary m-0 font-size-14">Vitals Settings</p>
                     </div>
                     <div class="row" id="vitals-settings-{{$patient->uid}}">
-                        <div class="col-4 border-right">
+                        <div class="col-5 border-right">
                             <div class="d-flex align-items-baseline">
                                 <b>BMI/Weight Management</b>
                                 <span class="mx-2 text-secondary">|</span>
@@ -955,7 +961,7 @@
                                 @include('app.patient.vitals-settings.bmi-management-summary')
                             </div>
                         </div>
-                        <div class="col-8">
+                        <div class="col-7">
                             <div class="d-flex align-items-baseline">
                                 <b>BP Management</b>
                                 <span class="mx-2 text-secondary">|</span>

resources/views/app/patient/notes.blade.php

@@ -240,7 +240,7 @@
                 <td>
                     <div class="d-flex align-items-center">
                         <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">Open</a>
-                        @if(1 || $note->new_or_fu_or_na !== 'NEW')
+                        @if($note->visitTemplate->internal_name == 'omega_soap_visit' &&  $note->new_or_fu_or_na !== 'NEW')
                             <span class="px-2 text-secondary">|</span>
                             @if(!$note->visit_template_id)
                                 <a href="#" class="text-primary trigger-clone" data-uid="{{$note->uid}}">Clone</a>

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

@@ -9,54 +9,58 @@
 <div class="mb-1 d-flex align-items-baseline">
     <span class="text-secondary text-nowrap">Weight (usual):</span>
     <div class="ml-2">
-        Between <b><?= vsValue('usual_weight_in_pounds_min', $patient) ?></b>
-        and <b><?= vsValue('usual_weight_in_pounds_max', $patient) ?></b>
+      @if($patient->usual_weight_in_pounds_min)
+        Between <b>{{$patient->usual_weight_in_pounds_min}}</b>
+        and <b>{{$patient->usual_weight_in_pounds_max}}</b>
+      @else
+      <span>-</span>
+      @endif
     </div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary text-nowrap">BMI (usual):</span>
     <div class="ml-2">
-        Between <span class="text-nowrap"><b><?= vsValue('usual_bmi_min', $patient) ?></b> <span class="text-secondary text-sm"><?= vsValue('usual_bmi_min_category', $patient) ?></span></span>
-        and <span class="text-nowrap"><b><?= vsValue('usual_bmi_max', $patient) ?></b> <span class="text-secondary text-sm"><?= vsValue('usual_bmi_max_category', $patient) ?></span></span>
+      @if($patient->usual_bmi_min)
+        Between <span class="text-nowrap"><b>{{$patient->usual_bmi_min}}</b> {{$patient->usual_bmi_min_category}}</span>
+        and <span class="text-nowrap"><b>{{$patient->usual_bmi_max}}</b> {{$patient->usual_bmi_max_category}}</span>
+      @else
+      <span>-</span>
+      @endif
     </div>
 </div>
 
 <div class="mb-1 d-flex align-items-baseline">
     <span class="text-secondary text-nowrap">Weight (ideal):</span>
     <div class="ml-2">
-        <b><?= vsValue('ideal_weight_in_pounds', $patient) ?></b>
+        <b>{{$patient->ideal_weight_in_pounds ?? '-'}}</b>
     </div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary text-nowrap">BMI (ideal):</span>
     <div class="ml-2">
-        <b><?= vsValue('ideal_bmi', $patient) ?></b>
-        <span class="text-secondary text-sm"><?= vsValue('ideal_bmi_category', $patient) ?></span>
+        <b>{{$patient->ideal_bmi ?? '-'}}</b>
+        <span class="text-secondary text-sm">{{$patient->ideal_bmi_category}}</span>
     </div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary mr-2">Goal:</span>
-    <div class="flex-grow-1"><?= vsValue('weight_management_goal_category', $patient) ?></div>
+    <div class="flex-grow-1">{{$patient->weight_management_goal_category ?? '-'}}</div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary mr-2">CHF?</span>
-    <div class="flex-grow-1"><?= vsValue('has_heart_failure_dx', $patient) ?></div>
+    <div class="flex-grow-1">{{$patient->has_heart_failure_dx ?? '-'}}</div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary mr-2">Weight monitoring prescribed?</span>
-    <div class="flex-grow-1">
-        <?= vsValue('is_weight_monitoring_needed', $patient) ?>
-    </div>
+    <div class="flex-grow-1">{{$patient->is_weight_monitoring_needed ?? '-'}}</div>
 </div>
 
 <div class="mb-3 d-flex align-items-baseline">
     <span class="text-secondary mr-2">Remarks:</span>
-    <div class="flex-grow-1">
-        <?= vsValue('why_is_weight_monitoring_needed', $patient) ?>
-    </div>
+    <div class="flex-grow-1">{{$patient->why_is_weight_monitoring_needed ?? '-'}}</div>
 </div>

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

@@ -1,287 +1,285 @@
-<button type="button" class="p-0 m-0 btn btn-link" data-toggle="modal" data-target="#bp-management-settings">
-  Update
-</button>
+<div moe extra-wide center id="bp-management-settings">
+    <a href="#" start show>Update</a>
+    <form url="/api/client/updateBpManagementSettingsValue">
+        <input type="hidden" name="uid" value="{{$patient->uid}}">
+        <p class="text-secondary font-weight-bold font-size-14">BP Management</p>
 
-<div class="modal fade" id="bp-management-settings" tabindex="-1" aria-labelledby="bp-management-settingsLabel" aria-hidden="true">
-  <div class="modal-dialog modal-xl modal-dialog-centered">
-    <div class="modal-content">
-      <div moe start class="modal-body">
-        <form show url="/api/client/updateBpManagementSettingsValue">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <p class="text-secondary font-weight-bold font-size-14">BP Management</p>
+        <div id="bpManagementComponent" class="row mx-0" v-cloak>
+            <div class="col-6 border-right">
+                <div class="text-secondary font-weight-bold mb-3">Blood Pressure & Pulse:</div>
+                <div class="pl-3">
+                    <h6 class="text-secondary mb-3"><b>Usual:</b></h6>
+                    <div class="d-flex pl-3">
+                        <div class="d-flex flex-column">
+                            <div v-if="form.doesUsualBpHaveAmPmVariation" class="text-secondary font-weight-bold mb-2">
+                                <i class="fa fa-sun mr-2"></i>AM
+                            </div>
+                            <div class="d-flex align-items-center mb-3">
+                                <h6 v-if="form.doesUsualBpHaveRange" class="mb-0 mr-3">LOWEST:</h6>
+                                <h6 class="mb-0 mr-3">BP:</h6>
+                                <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>
+                                <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMin" value="{{ $patient->usual_am_resting_pulse_min }}" />
+                                <span>BPM</span>
+                            </div>
+
+                            <div v-if="form.doesUsualBpHaveRange" class="d-flex align-items-center mb-3">
+                                <h6 class="mb-0 mr-3">HIGHEST:</h6>
+                                <h6 class="mb-0 mr-3">BP:</h6>
+                                <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>
+                                <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMax" value="{{ $patient->usual_am_resting_pulse_max }}" />
+                                <span>BPM</span>
+                            </div>
 
-            <div id="bpManagementComponent" class="row mx-0" v-cloak>
-                <div class="col-6 border-right">
-                    <div class="text-secondary font-weight-bold mb-3">Blood Pressure & Pulse:</div>
-                    <div class="pl-3">
-                        <h6 class="text-secondary mb-3"><b>Usual:</b></h6>
-                        <div class="d-flex pl-3">
-                            <div class="d-flex flex-column">
-                                <div v-if="form.doesUsualBpHaveAmPmVariation" class="text-secondary font-weight-bold mb-2">
-                                    <i class="fa fa-sun mr-2"></i>AM
+                            <div v-if="form.doesUsualBpHaveAmPmVariation">
+                                <!-- Moon -->
+                                <div class="text-secondary font-weight-bold mb-2">
+                                    <i class="fa fa-moon mr-2"></i>PM
                                 </div>
                                 <div class="d-flex align-items-center mb-3">
                                     <h6 v-if="form.doesUsualBpHaveRange" class="mb-0 mr-3">LOWEST:</h6>
                                     <h6 class="mb-0 mr-3">BP:</h6>
-                                    <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMin" value="{{ $patient->usual_am_resting_sbp_min }}" />
+                                    <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="usualAmRestingDbpMin" value="{{ $patient->usual_am_resting_dbp_min }}" />
+                                    <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>
-                                    <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMin" value="{{ $patient->usual_am_resting_pulse_min }}" />
+                                    <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMin" value="{{ $patient->usual_pm_resting_pulse_min }}" />
                                     <span>BPM</span>
                                 </div>
-
                                 <div v-if="form.doesUsualBpHaveRange" class="d-flex align-items-center mb-3">
                                     <h6 class="mb-0 mr-3">HIGHEST:</h6>
                                     <h6 class="mb-0 mr-3">BP:</h6>
-                                    <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMax" value="{{ $patient->usual_am_resting_sbp_max }}" />
+                                    <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="usualAmRestingDbpMax" value="{{ $patient->usual_am_resting_dbp_max }}" />
+                                    <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>
-                                    <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMax" value="{{ $patient->usual_am_resting_pulse_max }}" />
+                                    <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMax" value="{{ $patient->usual_pm_resting_pulse_max }}" />
                                     <span>BPM</span>
                                 </div>
 
-                                <div v-if="form.doesUsualBpHaveAmPmVariation">
-                                    <!-- Moon -->
-                                    <div class="text-secondary font-weight-bold mb-2">
-                                        <i class="fa fa-moon mr-2"></i>PM
-                                    </div>
-                                    <div class="d-flex align-items-center mb-3">
-                                        <h6 v-if="form.doesUsualBpHaveRange" class="mb-0 mr-3">LOWEST:</h6>
-                                        <h6 class="mb-0 mr-3">BP:</h6>
-                                        <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>
-                                        <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMin" value="{{ $patient->usual_pm_resting_pulse_min }}" />
-                                        <span>BPM</span>
-                                    </div>
-                                    <div v-if="form.doesUsualBpHaveRange" class="d-flex align-items-center mb-3">
-                                        <h6 class="mb-0 mr-3">HIGHEST:</h6>
-                                        <h6 class="mb-0 mr-3">BP:</h6>
-                                        <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>
-                                        <input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMax" value="{{ $patient->usual_pm_resting_pulse_max }}" />
-                                        <span>BPM</span>
-                                    </div>
+                            </div>
 
+                            <div class="d-flex align-items-start">
+                                <div class="form-check mr-2">
+                                    <input type="checkbox" class="form-check-input" id="amPmVariation" name="doesUsualBpHaveAmPmVariation" v-model="form.doesUsualBpHaveAmPmVariation">
+                                    <label class="form-check-label" for="amPmVariation">AM/PM Variation</label>
                                 </div>
-
-                                <div class="d-flex">
-                                    <div class="form-check mr-4">
-                                        <input type="checkbox" class="form-check-input mt-1" id="amPmVariation" name="doesUsualBpHaveAmPmVariation" v-model="form.doesUsualBpHaveAmPmVariation">
-                                        <label class="form-check-label" for="amPmVariation">AM/PM Variation</label>
-                                    </div>
-                                    <div class="form-check">
-                                        <input type="checkbox" class="form-check-input mt-1" id="bpRange" name="doesUsualBpHaveRange" v-model="form.doesUsualBpHaveRange">
-                                        <label class="form-check-label" for="bpRange">Range</label>
-                                    </div>
+                                <div class="form-check">
+                                    <input type="checkbox" class="form-check-input" id="bpRange" name="doesUsualBpHaveRange" v-model="form.doesUsualBpHaveRange">
+                                    <label class="form-check-label" for="bpRange">Range</label>
                                 </div>
-
                             </div>
+
                         </div>
+                    </div>
 
-                        <hr class="my-3">
-                        <div class="text-secondary font-weight-bold mb-3">Ideal BP:</div>
-                        <div class="pl-3 mb-3">
-                            <div class="d-flex align-items-center mb-3">
-                                <h6 class="mb-0 mr-3">Target:</h6>
-                                <h6 class="mb-0 mr-3">BP:</h6>
-                                <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>
-                                <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" />
-                                <span>BPM</span>
-                            </div>
+                    <hr class="my-3">
+                    <div class="text-secondary font-weight-bold mb-3">Ideal BP:</div>
+                    <div class="pl-3 mb-3">
+                        <div class="d-flex align-items-center mb-3">
+                            <h6 class="mb-0 mr-3">Target:</h6>
+                            <h6 class="mb-0 mr-3">BP:</h6>
+                            <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>
+                            <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" />
+                            <span>BPM</span>
                         </div>
-                        <hr class="my-3">
-                        <div class="text-secondary font-weight-bold mb-3">Alerts</div>
-                        <div class="pl-3 mb-3">
-                            <div class="text-secondary font-weight-bold mb-2"><i class="fa fa-circle text-danger mr-2"></i>Red</div>
-                            <div class="d-flex align-items-center mb-3">
-                                <h6 class="mb-0 mr-3">Above:</h6>
-                                <h6 class="mb-0 mr-3">BP:</h6>
-                                <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>
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" />
-                                <span>BPM</span>
-                            </div>
-                            <div class="d-flex align-items-center mb-3">
-                                <h6 class="mb-0 mr-3">Below:</h6>
-                                <h6 class="mb-0 mr-3">BP:</h6>
-                                <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>
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" />
-                                <span>BPM</span>
-                            </div>
+                    </div>
+                    <hr class="my-3">
+                    <div class="text-secondary font-weight-bold mb-3">Alerts</div>
+                    <div class="pl-3 mb-3">
+                        <div class="text-secondary font-weight-bold mb-2"><i class="fa fa-circle text-danger mr-2"></i>Red</div>
+                        <div class="d-flex align-items-center mb-3">
+                            <h6 class="mb-0 mr-3">Above:</h6>
+                            <h6 class="mb-0 mr-3">BP:</h6>
+                            <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>
+                            <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" />
+                            <span>BPM</span>
                         </div>
-                        <div class="pl-3 mb-3">
-                            <div class="text-secondary font-weight-bold mb-2"><i class="fa fa-circle text-warning-mellow mr-2"></i>Yellow</div>
-                            <div class="d-flex align-items-center mb-3">
-                                <h6 class="mb-0 mr-3">Above:</h6>
-                                <h6 class="mb-0 mr-3">BP:</h6>
-                                <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>
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" />
-                                <span>BPM</span>
-                            </div>
-                            <div class="d-flex align-items-center mb-3">
-                                <h6 class="mb-0 mr-3">Below:</h6>
-                                <h6 class="mb-0 mr-3">BP:</h6>
-                                <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>
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" />
-                                <span>BPM</span>
-                            </div>
+                        <div class="d-flex align-items-center mb-3">
+                            <h6 class="mb-0 mr-3">Below:</h6>
+                            <h6 class="mb-0 mr-3">BP:</h6>
+                            <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>
+                            <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" />
+                            <span>BPM</span>
                         </div>
                     </div>
-                </div>
-                <div class="col-6">
-                    <div class="mb-2 d-flex align-items-start">
-                        <span class="text-secondary min-width-140px w-50">Reports prehypertension?</span>
-                        <div class="w-50">
-                            <select type="text" class="form-control form-control-sm min-width-unset" name="hasPrehypertensionDx">
-                                <option value="">-- select --</option>
-                                <option {{$patient->has_prehypertension_dx === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
-                                <option {{$patient->has_prehypertension_dx === 'NO' ? 'selected' : ''}} value="NO">No</option>
-                                <option {{$patient->has_prehypertension_dx === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
-                            </select>
+                    <div class="pl-3 mb-3">
+                        <div class="text-secondary font-weight-bold mb-2"><i class="fa fa-circle text-warning-mellow mr-2"></i>Yellow</div>
+                        <div class="d-flex align-items-center mb-3">
+                            <h6 class="mb-0 mr-3">Above:</h6>
+                            <h6 class="mb-0 mr-3">BP:</h6>
+                            <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>
+                            <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" />
+                            <span>BPM</span>
                         </div>
-                    </div>
-                    <div class="mb-2 d-flex align-items-start">
-                        <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>
-                                <option {{$patient->has_hypertension_dx === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
-                                <option {{$patient->has_hypertension_dx === 'NO' ? 'selected' : ''}} value="NO">No</option>
-                                <option {{$patient->has_hypertension_dx === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
-                            </select>
+                        <div class="d-flex align-items-center mb-3">
+                            <h6 class="mb-0 mr-3">Below:</h6>
+                            <h6 class="mb-0 mr-3">BP:</h6>
+                            <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>
+                            <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" />
+                            <span>BPM</span>
                         </div>
                     </div>
-                    <div class="mb-2 d-flex align-items-start">
-                        <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>
-                                <option {{$patient->is_prescribed_hypertension_medicine === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
-                                <option {{$patient->is_prescribed_hypertension_medicine === 'NO' ? 'selected' : ''}} value="NO">No</option>
-                                <option {{$patient->is_prescribed_hypertension_medicine === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
-                            </select>
-                        </div>
+                </div>
+            </div>
+            <div class="col-6">
+                <div class="mb-2 d-flex align-items-start">
+                    <span class="text-secondary min-width-140px w-50">Reports prehypertension?</span>
+                    <div class="w-50">
+                        <select type="text" class="form-control form-control-sm min-width-unset" name="hasPrehypertensionDx">
+                            <option value="">-- select --</option>
+                            <option {{$patient->has_prehypertension_dx === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                            <option {{$patient->has_prehypertension_dx === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            <option {{$patient->has_prehypertension_dx === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                        </select>
                     </div>
-                    <div class="mb-2 d-flex align-items-start">
-                        <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>
-                                <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
-                                <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'NO' ? 'selected' : ''}} value="NO">No</option>
-                                <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
-                            </select>
-                        </div>
+                </div>
+                <div class="mb-2 d-flex align-items-start">
+                    <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>
+                            <option {{$patient->has_hypertension_dx === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                            <option {{$patient->has_hypertension_dx === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            <option {{$patient->has_hypertension_dx === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="mb-2 d-flex align-items-start">
+                    <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>
+                            <option {{$patient->is_prescribed_hypertension_medicine === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                            <option {{$patient->is_prescribed_hypertension_medicine === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            <option {{$patient->is_prescribed_hypertension_medicine === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="mb-2 d-flex align-items-start">
+                    <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>
+                            <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                            <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            <option {{$patient->is_goal_to_reduce_hypertension_medicine === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                        </select>
                     </div>
+                </div>
 
-                    <div class="text-secondary min-width-140px mb-1">Describe the goal:</div>
-                    <input type="text" class="form-control form-control-sm min-width-unset" name="goalToReduceHypertensionMedicineMemo" value="{{$patient->goal_to_reduce_hypertension_medicine_memo}}">
+                <div class="text-secondary min-width-140px mb-1">Describe the goal:</div>
+                <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">
-                    <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>
-                                <option {{$patient->is_bp_monitoring_needed === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
-                                <option {{$patient->is_bp_monitoring_needed === 'NO' ? 'selected' : ''}} value="NO">No</option>
-                                <option {{$patient->is_bp_monitoring_needed === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
-                            </select>
-                        </div>
+                <div class="my-3 d-flex align-items-center">
+                    <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>
+                            <option {{$patient->is_bp_monitoring_needed === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                            <option {{$patient->is_bp_monitoring_needed === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            <option {{$patient->is_bp_monitoring_needed === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
+                        </select>
                     </div>
+                </div>
 
-                    {{--
-                    <hr class="my-3">
-                    <div class="text-secondary min-width-140px mb-1">ICDs</div>
-                    <table class="table table-sm table-striped table-bordered mb-3">
-                        <thead>
-                        <tr class="bg-light text-secondary">
-                            <th class="border-bottom-0 width-30px">#</th>
-                            <th class="border-bottom-0 w-25">Code</th>
-                            <th class="border-bottom-0">Description</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                            <td class="p-0 align-middle text-center">1</td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd1', 'text', 'whyIsBpMonitoringNeededIcd1', $patient) ?></td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description1', 'text', 'whyIsBpMonitoringNeededDescription1', $patient) ?></td>
-                        </tr>
-                        <tr>
-                            <td class="p-0 align-middle text-center">2</td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd2', 'text', 'whyIsBpMonitoringNeededIcd2', $patient) ?></td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description2', 'text', 'whyIsBpMonitoringNeededDescription2', $patient) ?></td>
-                        </tr>
-                        <tr>
-                            <td class="p-0 align-middle text-center">3</td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd3', 'text', 'whyIsBpMonitoringNeededIcd3', $patient) ?></td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description3', 'text', 'whyIsBpMonitoringNeededDescription3', $patient) ?></td>
-                        </tr>
-                        <tr>
-                            <td class="p-0 align-middle text-center">4</td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd4', 'text', 'whyIsBpMonitoringNeededIcd4', $patient) ?></td>
-                            <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description4', 'text', 'whyIsBpMonitoringNeededDescription4', $patient) ?></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    --}}
-                    <div class="text-secondary min-width-140px mb-1">Remarks on clinical need:</div>
-                    <input type="text" class="form-control form-control-sm min-width-unset" name="whyIsBpMonitoringNeeded" value="{{$patient->why_is_bp_monitoring_needed}}">
+                {{--
+                <hr class="my-3">
+                <div class="text-secondary min-width-140px mb-1">ICDs</div>
+                <table class="table table-sm table-striped table-bordered mb-3">
+                    <thead>
+                    <tr class="bg-light text-secondary">
+                        <th class="border-bottom-0 width-30px">#</th>
+                        <th class="border-bottom-0 w-25">Code</th>
+                        <th class="border-bottom-0">Description</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="p-0 align-middle text-center">1</td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd1', 'text', 'whyIsBpMonitoringNeededIcd1', $patient) ?></td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description1', 'text', 'whyIsBpMonitoringNeededDescription1', $patient) ?></td>
+                    </tr>
+                    <tr>
+                        <td class="p-0 align-middle text-center">2</td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd2', 'text', 'whyIsBpMonitoringNeededIcd2', $patient) ?></td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description2', 'text', 'whyIsBpMonitoringNeededDescription2', $patient) ?></td>
+                    </tr>
+                    <tr>
+                        <td class="p-0 align-middle text-center">3</td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd3', 'text', 'whyIsBpMonitoringNeededIcd3', $patient) ?></td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description3', 'text', 'whyIsBpMonitoringNeededDescription3', $patient) ?></td>
+                    </tr>
+                    <tr>
+                        <td class="p-0 align-middle text-center">4</td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_icd4', 'text', 'whyIsBpMonitoringNeededIcd4', $patient) ?></td>
+                        <td class="p-0 align-middle text-center"><?= vsElement('why_is_bp_monitoring_needed_description4', 'text', 'whyIsBpMonitoringNeededDescription4', $patient) ?></td>
+                    </tr>
+                    </tbody>
+                </table>
+                --}}
+                <div class="text-secondary min-width-140px mb-1">Remarks on clinical need:</div>
+                <input type="text" class="form-control form-control-sm min-width-unset" name="whyIsBpMonitoringNeeded" value="{{$patient->why_is_bp_monitoring_needed}}">
 
-                </div>
             </div>
+        </div>
 
-            <div class="pt-2">
-                <button class="btn btn-primary btn-sm dismiss" submit>Submit</button>
-                <button class="btn btn-default border btn-sm dismiss" cancel>Cancel</button>
-            </div>
-        </form>
-      </div>
-    </div>
-  </div>
+        <div class="pt-2">
+            <button class="btn btn-primary btn-sm" submit>Submit</button>
+            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+        </div>
+    </form>
 </div>
 <script>
-    var doesUsualBpHaveAmPmVariation = <?= $patient->does_usual_bp_have_am_pm_variation ? 1:0 ?>;
-    var doesUsualBpHaveRange = <?= $patient->does_usual_bp_have_range ? 1:0 ?>;
+    var doesUsualBpHaveAmPmVariation = <?= $patient->does_usual_bp_have_am_pm_variation ? 1 : 0 ?>;
+    var doesUsualBpHaveRange = <?= $patient->does_usual_bp_have_range ? 1 : 0 ?>;
     // BP Management
     var BPManagementComponent = new Vue({
-        el:'#bpManagementComponent',
-        data:{
-            form:{
+        el: '#bpManagementComponent',
+        data: {
+            form: {
                 doesUsualBpHaveAmPmVariation: parseInt(doesUsualBpHaveAmPmVariation),
                 doesUsualBpHaveRange: parseInt(doesUsualBpHaveRange)
             }
+        },
+        methods: {
+
+            init: function() {
+                console.log({
+                    form: this.form
+                });
+            }
         }
     });
-    $('.dismiss').on('click', function(){
-      $('#bp-management-settings').modal('hide');
-    });
     (function() {
 
         function initICDAutoSuggest(_codeElem, _descElem) {
-            if(_codeElem.is('[ac-initialized]')) return false;
-            var elem = _codeElem[0], descElem = _descElem[0], dynID = 'icd-' + Math.ceil(Math.random() * 1000000);
+            if (_codeElem.is('[ac-initialized]')) return false;
+            var elem = _codeElem[0],
+                descElem = _descElem[0],
+                dynID = 'icd-' + Math.ceil(Math.random() * 1000000);
             $(elem).attr('id', dynID);
             new window.Def.Autocompleter.Search(dynID,
                 'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
@@ -292,7 +290,7 @@
             );
             window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
                 let acData = elem.autocomp.getSelectedItemData();
-                if(!acData[0] || !acData[0].data) return false;
+                if (!acData[0] || !acData[0].data) return false;
                 $(elem).val(acData[0].code);
                 $(descElem).val(acData[0].data.name);
                 return false;

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

@@ -1,171 +1,223 @@
 
-<div class="row">
-    <div class="col-6 border-right">
+<div class="flex-container">
+    <div>
         <h6 class="text-secondary font-weight-bold mb-3">Usual:</h6>
         <div class="d-flex mb-3">
             <div class="pl-3">
                 @if($patient->does_usual_bp_have_am_pm_variation)
                     <div class="text-secondary font-weight-bold mb-2"><i class="fa fa-sun"></i> AM</div>
                 @endif
-                <div class="d-flex align-items-center">
+                <div class="d-flex align-items-center mb-2">
                     @if($patient->does_usual_bp_have_range)
                         <h6 class="mb-0 mr-2">LOWEST:</h6>
                     @endif
                     <h6 class="mb-0 mr-2">BP:</h6>
-                    <span><b><?= vsValue('usual_am_resting_sbp_min', $patient) ?></b></span>
+                    <span><b>{{$patient->usual_am_resting_sbp_min ?? '-'}}</b></span>
+                    @if($patient->usual_am_resting_dbp_min)
                     <span>/</span>
-                    <span class="mr-2"><b><?= vsValue('usual_am_resting_dbp_min', $patient) ?></b></span>
-                    <span class="mr-2">mm Hg Pulse:</span>
-                    <span><b><?= vsValue('usual_am_resting_pulse_min', $patient) ?></b></span>
+                    <span class="mr-2"><b>{{$patient->usual_am_resting_dbp_min}}</b></span>
+                    @endif
+                    @if($patient->usual_am_resting_pulse_min)
+                    <span class="mr-2">Pulse:</span>
+                    <span><b>{{$patient->usual_am_resting_pulse_min}}</b></span>
                     <span class="ml-2">BPM</span>
+                    @endif
                 </div>
                 @if($patient->does_usual_bp_have_range)
-                    <div class="d-flex align-items-center">
+                    <div class="d-flex align-items-center mb-2">
                         <h6 class="mb-0 mr-2">HIGHEST:</h6>
                         <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('usual_am_resting_sbp_max', $patient) ?></b></span>
+                        <span><b>{{$patient->usual_am_resting_sbp_max ?? '-'}}</b></span>
+                        @if($patient->usual_am_resting_dbp_max)
                         <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('usual_am_resting_dbp_max', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('usual_am_resting_pulse_max', $patient) ?></b></span>
+                        <span class="mr-2"><b>{{$patient->usual_am_resting_dbp_max}}</b></span>
+                        @endif
+                        @if($patient->usual_am_resting_pulse_max)
+                        <span class="mr-2">Pulse:</span>
+                        <span><b>{{$patient->usual_am_resting_pulse_max}}</b></span>
                         <span class="ml-2">BPM</span>
+                        @endif
                     </div>
                 @endif
                 @if($patient->does_usual_bp_have_am_pm_variation)
                     <div class="text-secondary font-weight-bold my-2"><i class="fa fa-moon"></i> PM</div>
-                    <div class="d-flex align-items-center">
+                    <div class="d-flex align-items-center mb-2">
                         @if($patient->does_usual_bp_have_range)
                             <h6 class="mb-0 mr-2">LOWEST:</h6>
                         @endif
                         <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('usual_pm_resting_sbp_min', $patient) ?></b></span>
+                        <span><b>{{$patient->usual_pm_resting_sbp_min ?? '-'}}</b></span>
+                        @if($patient->usual_pm_resting_dbp_min)
                         <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('usual_pm_resting_dbp_min', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('usual_pm_resting_pulse_min', $patient) ?></b></span>
+                        <span class="mr-2"><b>{{$patient->usual_pm_resting_dbp_min}}</b></span>
+                        @endif
+                        @if($patient->usual_pm_resting_pulse_min)
+                        <span class="mr-2">Pulse:</span>
+                        <span><b>{{$patient->usual_pm_resting_pulse_min}}</b></span>
                         <span class="ml-2">BPM</span>
+                        @endif
                     </div>
                 @endif
                 @if($patient->does_usual_bp_have_range)
-                    <div class="d-flex align-items-center">
+                    <div class="d-flex align-items-center mb-2">
                         @if($patient->does_usual_bp_have_range)
                             <h6 class="mb-0 mr-2">HIGHEST:</h6>
                         @endif
                         <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('usual_pm_resting_sbp_max', $patient) ?></b></span>
+                        <span><b>{{$patient->usual_pm_resting_sbp_max ?? '-'}}</b></span>
+                        @if($patient->usual_pm_resting_dbp_max)
                         <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('usual_pm_resting_dbp_max', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('usual_pm_resting_pulse_max', $patient) ?></b></span>
+                        <span class="mr-2"><b>{{$patient->usual_pm_resting_dbp_max}}</b></span>
+                        @endif
+                        @if($patient->usual_pm_resting_pulse_max)
+                        <span class="mr-2">Pulse:</span>
+                        <span><b>{{$patient->usual_pm_resting_pulse_max}}</b></span>
                         <span class="ml-2">BPM</span>
+                        @endif
                     </div>
                 @endif
             </div>
         </div>
+        @if($patient->ideal_am_resting_sbp_min)
         <div class="mb-3">
             <h6 class="text-secondary font-weight-bold">Ideal BP</h6>
             <div class="pl-3">
                 <div class="d-flex align-items-center">
                     <h6 class="mb-0 mr-2">Target:</h6>
                     <h6 class="mb-0 mr-2">BP:</h6>
-                    <span><b><?= vsValue('ideal_am_resting_sbp_min', $patient) ?></b></span>
+                    <span><b>{{$patient->ideal_am_resting_sbp_min ?? '-'}}</b></span>
+                    @if($patient->ideal_am_resting_dbp_min)
                     <span>/</span>
-                    <span class="mr-2"><b><?= vsValue('ideal_am_resting_dbp_min', $patient) ?></b></span>
-                    <span class="mr-2">mm Hg Pulse:</span>
-                    <span><b><?= vsValue('ideal_am_resting_pulse', $patient) ?></b></span>
+                    <span class="mr-2"><b>{{$patient->ideal_am_resting_dbp_min}}</b></span>
+                    @endif
+                    @if($patient->ideal_am_resting_pulse)
+                    <span class="mr-2">Pulse:</span>
+                    <span><b>{{$patient->ideal_am_resting_pulse}}</b></span>
                     <span class="ml-2">BPM</span>
+                    @endif
                 </div>
             </div>
         </div>
+        @endif
 
         <div class="mb-3">
             <h6 class="text-secondary font-weight-bold mb-3">Alerts</h6>
             <div class="pl-3">
-                <div class="mb-3">
-                    <div class="mb-2"><i class="fa fa-circle text-danger"></i> Red</div>
-                    <div class="d-flex align-items-center">
-                        <h6 class="mb-0 mr-2">Above:</h6>
-                        <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('red_alert_when_sbp_above', $patient) ?></b></span>
-                        <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('red_alert_when_dbp_above', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('red_alert_when_pulse_above', $patient) ?></b></span>
-                        <span class="ml-2">BPM</span>
-                    </div>
-                    <div class="d-flex align-items-center">
-                        <h6 class="mb-0 mr-2">Below:</h6>
-                        <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('red_alert_when_sbp_below', $patient) ?></b></span>
-                        <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('red_alert_when_dbp_below', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('red_alert_when_pulse_below', $patient) ?></b></span>
-                        <span class="ml-2">BPM</span>
+                <div class="d-flex align-items-start mb-3">
+                  <?php
+                    $redAlertHasContent = $patient->red_alert_when_sbp_above || $patient->red_alert_when_sbp_below;
+                   ?>
+                    <div class="mr-2"><i class="fa fa-circle text-danger"></i> @if(!$redAlertHasContent)<span class="ml-2">-</span> @endif</div>
+                    <div>
+                      @if($redAlertHasContent)
+                      <div class="d-flex align-items-center">
+                          <h6 class="mb-0 mr-2">Above:</h6>
+                          <h6 class="mb-0 mr-2">BP:</h6>
+                          <span><b>{{$patient->red_alert_when_sbp_above ?? '-'}}</b></span>
+                          @if($patient->red_alert_when_dbp_above)
+                          <span>/</span>
+                          <span class="mr-2"><b>{{$patient->red_alert_when_dbp_above}}</b></span>
+                          @endif
+                          @if($patient->red_alert_when_pulse_above)
+                          <span class="mr-2">Pulse:</span>
+                          <span><b>{{$patient->red_alert_when_pulse_above}}</b></span>
+                          <span class="ml-2">BPM</span>
+                          @endif
+                      </div>
+                      <div class="d-flex align-items-center">
+                          <h6 class="mb-0 mr-2">Below:</h6>
+                          <h6 class="mb-0 mr-2">BP:</h6>
+                          <span><b>{{$patient->red_alert_when_sbp_below ?? '-'}}</b></span>
+                          @if($patient->red_alert_when_dbp_below)
+                          <span>/</span>
+                          <span class="mr-2"><b>{{$patient->red_alert_when_dbp_below}}</b></span>
+                          @endif
+                          @if($patient->red_alert_when_pulse_below)
+                          <span class="mr-2">Pulse:</span>
+                          <span><b>{{$patient->red_alert_when_pulse_below}}</b></span>
+                          <span class="ml-2">BPM</span>
+                          @endif
+                      </div>
+                      @endif
                     </div>
                 </div>
-                <div class="mb-3">
-                    <div class="mb-2"><i class="fa fa-circle text-warning-mellow"></i> Yellow</div>
-                    <div class="d-flex align-items-center">
-                        <h6 class="mb-0 mr-2">Above:</h6>
-                        <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('yellow_alert_when_sbp_above', $patient) ?></b></span>
-                        <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('yellow_alert_when_dbp_above', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('yellow_alert_when_pulse_above', $patient) ?></b></span>
-                        <span class="ml-2">BPM</span>
-                    </div>
-                    <div class="d-flex align-items-center">
-                        <h6 class="mb-0 mr-2">Below:</h6>
-                        <h6 class="mb-0 mr-2">BP:</h6>
-                        <span><b><?= vsValue('yellow_alert_when_sbp_below', $patient) ?></b></span>
-                        <span>/</span>
-                        <span class="mr-2"><b><?= vsValue('yellow_alert_when_dbp_below', $patient) ?></b></span>
-                        <span class="mr-2">mm Hg Pulse:</span>
-                        <span><b><?= vsValue('yellow_alert_when_pulse_below', $patient) ?></b></span>
-                        <span class="ml-2">BPM</span>
+                <div class="d-flex align-items-start mb-3">
+                    <?php
+                      $yellowAlertHasContent = $patient->yellow_alert_when_sbp_above || $patient->yellow_alert_when_sbp_below;
+                     ?>
+                    <div class="mr-2"><i class="fa fa-circle text-warning-mellow"></i> @if(!$yellowAlertHasContent)<span class="ml-2">-</span> @endif</div>
+                    <div>
+                      @if($yellowAlertHasContent)
+                      <div class="d-flex align-items-center">
+                          <h6 class="mb-0 mr-2">Above:</h6>
+                          <h6 class="mb-0 mr-2">BP:</h6>
+                          <span><b>{{$patient->yellow_alert_when_sbp_above ?? '-'}}</b></span>
+                          @if($patient->yellow_alert_when_dbp_above)
+                          <span>/</span>
+                          <span class="mr-2"><b>{{$patient->yellow_alert_when_dbp_above}}</b></span>
+                          @endif
+                          @if($patient->yellow_alert_when_pulse_above)
+                          <span class="mr-2">Pulse:</span>
+                          <span><b>{{$patient->yellow_alert_when_pulse_above}}</b></span>
+                          <span class="ml-2">BPM</span>
+                          @endif
+                      </div>
+                      <div class="d-flex align-items-center">
+                          <h6 class="mb-0 mr-2">Below:</h6>
+                          <h6 class="mb-0 mr-2">BP:</h6>
+                          <span><b>{{$patient->yellow_alert_when_sbp_below ?? '-'}}</b></span>
+                          @if($patient->yellow_alert_when_dbp_below)
+                          <span>/</span>
+                          <span class="mr-2"><b>{{$patient->yellow_alert_when_dbp_below}}</b></span>
+                          @endif
+                          @if($patient->yellow_alert_when_pulse_below)
+                          <span class="mr-2">Pulse:</span>
+                          <span><b>{{$patient->yellow_alert_when_pulse_below}}</b></span>
+                          <span class="ml-2">BPM</span>
+                          @endif
+                      </div>
+                      @endif
                     </div>
                 </div>
             </div>
         </div>
 
     </div>
-    <div class="col-6">
+    <div class="">
         <div class="table-responsive">
             <table class="table table-sm table-striped table-bordered">
                 <tbody>
                     <tr>
                         <td>Reports prehypertension?</td>
-                        <td><?= vsValue('has_prehypertension_dx', $patient) ?></td>
+                        <td>{{$patient->has_prehypertension_dx ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>Reports hypertension?</td>
-                        <td><?= vsValue('has_hypertension_dx', $patient) ?></td>
+                        <td>{{$patient->has_hypertension_dx ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>Reports hypertension medicine?</td>
-                        <td><?= vsValue('is_prescribed_hypertension_medicine', $patient) ?></td>
+                        <td>{{$patient->is_prescribed_hypertension_medicine ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>Is it a goal to reduce<br>hypertension medicine?</td>
-                        <td><?= vsValue('is_goal_to_reduce_hypertension_medicine', $patient) ?></td>
+                        <td>{{$patient->is_goal_to_reduce_hypertension_medicine ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>Describe the goal</td>
-                        <td><?= vsValue('goal_to_reduce_hypertension_medicine_memo', $patient) ?></td>
+                        <td>{{$patient->goal_to_reduce_hypertension_medicine_memo ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>BP monitoring prescribed?</td>
-                        <td><?= vsValue('is_bp_monitoring_needed', $patient) ?></td>
+                        <td>{{$patient->is_bp_monitoring_needed ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>BP monitoring prescribed?</td>
-                        <td><?= vsValue('is_bp_monitoring_needed', $patient) ?></td>
+                        <td>{{$patient->is_bp_monitoring_needed ?? '-'}}</td>
                     </tr>
                     <tr>
                         <td>Remarks</td>
-                        <td><?= vsValue('why_is_bp_monitoring_needed', $patient) ?></td>
+                        <td>{{$patient->why_is_bp_monitoring_needed ?? '-'}}</td>
                     </tr>
                 </tbody>
             </table>

resources/views/app/practice-management/remote-monitoring-admin-row-markup.blade.php

@@ -32,17 +32,6 @@
             @endif
         </div>
     </td>
-    <td>
-        <div class="d-flex align-items-baseline">
-            @if($iPatient->most_recent_completed_mcp_note_uid_cm)
-                <a href = "/patients/view/{{$iPatient->client_uid}}/notes/view/{{$iPatient->most_recent_completed_mcp_note_uid_cm}}">
-                    <span class="sort-data">{{$iPatient->most_recent_completed_mcp_note_date_cm ? friendly_date($iPatient->most_recent_completed_mcp_note_date_cm) : '-'}}</span>
-                </a>
-            @else
-                <span class="sort-data">-</span>
-            @endif
-        </div>
-    </td>
     <td>
         <div class="d-flex align-items-baseline">
             <i class="mr-1 text-sm fa {{$lastVisitWithin90Days ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger'}}"></i>

resources/views/app/practice-management/remote-monitoring-admin.blade.php

@@ -91,7 +91,6 @@
                                 <th class="border-0">Cell. Scale?</th>
                                 <th class="border-0">Last BP</th>
                                 <th class="border-0">Last Wt</th>
-                                <th class="border-0">Last Visit</th>
                                 <th class="border-0">Days Since<br>Last Visit</th>
                                 <th class="border-0">Interacted?</th>
                                 <th class="border-0">#Meas. Days</th>

resources/views/app/practice-management/remote-monitoring-row-markup.blade.php

@@ -32,17 +32,7 @@
             @endif
         </div>
     </td>
-    <td>
-        <div class="d-flex align-items-baseline">
-            @if($iPatient->most_recent_completed_mcp_note_uid_cm)
-                <a href = "/patients/view/{{$iPatient->client_uid}}/notes/view/{{$iPatient->most_recent_completed_mcp_note_uid_cm}}">
-                    <span class="sort-data">{{$iPatient->most_recent_completed_mcp_note_date_cm ? friendly_date($iPatient->most_recent_completed_mcp_note_date_cm) : '-'}}</span>
-                </a>
-            @else
-                <span class="sort-data">-</span>
-            @endif
-        </div>
-    </td>
+    
     <td>
         <div class="d-flex align-items-baseline">
             <i class="mr-1 text-sm fa {{$lastVisitWithin90Days ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger'}}"></i>

resources/views/app/practice-management/remote-monitoring.blade.php

@@ -101,7 +101,6 @@
                                 <th class="border-0">Cell. Scale?</th>
                                 <th class="border-0">Last BP</th>
                                 <th class="border-0">Last Wt</th>
-                                <th class="border-0">Last Visit</th>
                                 <th class="border-0">Days Since Last Visit</th>
                                 <th class="border-0">Interacted?</th>
                                 <th class="border-0">#Meas. Days</th>

routes/web.php

@@ -162,6 +162,11 @@ Route::middleware('pro.auth')->group(function () {
             Route::get('financial-transactions', 'DnaController@financialTransactions')->name('financialTransactions');
             Route::get('my-bills', 'DnaController@myBills')->name('myBills');
             Route::get('my-clinical-teams', 'DnaController@myClinicalTeams')->name('myClinicalTeams');
+            Route::get('my-clinical-teams', 'DnaController@myClinicalTeams')->name('myClinicalTeams');
+            
+            Route::name('my-clinical-teams.view.')->prefix('my-clinical-teams/view/{team}')->group(function () {
+                Route::get('dashboard', 'DnaController@teamDashboard')->name('team-dashboard');
+            });
 
             Route::get('bills', 'DnaController@bills')->name('bills');
             Route::get('erx-and-orders', 'DnaController@erx_and_orders')->name('erx_and_orders');