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

app/Helpers/fdb.php

@@ -421,10 +421,12 @@ if(!function_exists('drugDrugInteractionSinglePair')) {
         }
 
         if (count($activeCatches)) {
-            $output[] = "<b>{$_rx2->data->name}</b> interacts with one or more active ingredients in <b>{$_rx1->data->name}</b>.";
+            $t = "<b>{$_rx2->data->name}</b> interacts with one or more active ingredients in <b>{$_rx1->data->name}</b>.";
+            $output[] = "<span class='events-all' title=\"" . strip_tags(str_replace('"', '', $t)) . "\">" . $t . "</span>";
         }
         if (count($inactiveCatches)) {
-            $output[] = "<b>{$_rx2->data->name}</b> interacts with one or more inactive ingredients in <b>{$_rx1->data->name}</b>.";
+            $t = "<b>{$_rx2->data->name}</b> interacts with one or more inactive ingredients in <b>{$_rx1->data->name}</b>.";
+            $output[] = "<span class='events-all' title=\"" . strip_tags(str_replace('"', '', $t)) . "\">" . $t . "</span>";
         }
 
         // TODO: find out and show the names of the actual ingredients causing interaction
@@ -539,7 +541,7 @@ if(!function_exists('duplicate_therapy_info')) {
         if(!count($matches)) return '';
 
         return "<ol class='pl-0 ml-3 mb-0'>" . implode("", array_map(function ($_x) {
-                return "<li class='mb-1'>" . $_x . "</li>";
+                return "<li class='mb-1 events-all' title=\"" . strip_tags(str_replace('"', '', $_x)) . "\">" . $_x . "</li>";
             }, $matches)) . "</ol>";
     }
 }

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 101,
+    'asset_version' => 102,
 
 
     'temp_dir' => env('TEMP_DIR'),

public/css/style.css

@@ -406,6 +406,11 @@ body>nav.navbar {
     min-width: 30px !important;
     max-width: 30px !important;
 }
+.mcp-theme-1 .width-35px {
+    width: 35px !important;
+    min-width: 35px !important;
+    max-width: 35px !important;
+}
 .mcp-theme-1 .width-40px {
     width: 40px !important;
 }
@@ -615,6 +620,18 @@ body [note-rte][data-field-name="planValue"] .ql-editor[contenteditable] {
 .events-none {
     pointer-events: none;
 }
+.events-all {
+    pointer-events: all !important;
+}
+body .no-bold-children * {
+    font-weight: normal !important;
+}
+.mrv-sidebar ol>li {
+    margin-bottom: 0 !important;
+    /*white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;*/
+}
 .blocking-overlay {
     opacity: 0 !important;
     cursor: default;
@@ -3670,7 +3687,7 @@ table.v-top th {
     top: 55px;
     width: calc(100% - 30px);
     height: 36px;
-    z-index: 2;
+    z-index: 98;
     background: #fff;
     border-bottom: 1px solid #ccc;
     left: 30px;
@@ -3692,3 +3709,7 @@ table.v-top th {
     line-height: 12px;
     right: calc(50% - 7px);
 }
+.note-content-divider {
+    background: #ddd;
+    height: 20px;
+}

resources/views/app/dashboard-admin.blade.php

@@ -572,7 +572,7 @@
                                         </tbody>
                                     </table>
                                 @else
-                                    <span class="text-secondary">No follow ups scheduled for today!</span>
+                                    <div class="text-secondary p-2">No follow ups scheduled for today!</div>
                                 @endif
                             </div>
                         </div>
@@ -1094,7 +1094,7 @@
                                 trigger.hide();
                                 let doneElem = $('<i class="text-success fa fa-check"></i>');
                                 doneElem.insertAfter(trigger);
-                                setTimeout(() => {
+                                /*setTimeout(() => {
                                     let ackContainer = trigger.closest('.ack-container');
                                     trigger.closest('div').slideUp('fast', function () {
                                         $(this).remove();
@@ -1102,7 +1102,7 @@
                                             ackContainer.remove();
                                         }
                                     });
-                                }, 500);
+                                }, 500);*/
                             }
                         }, 'json');
                         return false;

resources/views/app/dashboard-mcp.blade.php

@@ -409,7 +409,7 @@
                                             </tbody>
                                         </table>
                                     @else
-                                        <span class="text-secondary">No follow ups scheduled for today!</span>
+                                        <div class="p-2">No follow ups scheduled for today!</div>
                                     @endif
                                 </div>
                             </div>
@@ -417,31 +417,10 @@
                             <div id="mcp-dashboard-appointments" class="mb-4">
 
                             </div>
-                            {{--@if($performer->pro->can_view_rm_matrix || $performer->pro->pro_type=='ADMIN')
-                            <div class="card mb-4">
-                                <div class="card-header pl-2">
-                                    <strong>
-                                        Remote Monitoring: {{friendly_month(date('Y-m-d'))}}
-                                    </strong>
-                                </div>
-                                <div class="card-body p-1">
-                                    @include('app.practice-management.remote-monitoring-tree')
-                                </div>
-                            </div>
-                            @endif--}}
-                            {{--
+
                             <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>
-                                        <!--<a href="{{ route('mcp.measurements_mass_stamping') }}"
-                                           native target="_blank"
-                                           open-in-stag-popup
-                                           update-parent
-                                           popup-style="tall"
-                                           mc-initer="measurements-mass-stamp"
-                                           title="Measurements Pending Stamping">
-                                            Measurements Pending Stamping
-                                        </a>-->
                                         Measurements Pending Stamping
                                     </strong>
                                 </div>
@@ -449,7 +428,7 @@
                                     @include('app.mcp.dashboard.measurements-pending-stamping')
                                 </div>
                             </div>
-                            --}}
+
                             @if($pro->is_considered_for_supervising_physician)
                             <!-- ENCOUNTERS PENDING MY REVIEW -->
                             <div class="card mb-4">
@@ -465,16 +444,9 @@
                             @endif
                         </div>
                         <div class="col-md-6 mcp-theme-1 pl-1">
-                            <div class="card mb-4">
-                                <div class="card-header pl-2">
-                                    <strong>
-                                        Notifications
-                                    </strong>
-                                </div>
-                                <div class="card-body p-0">
-                                    @include('app.mcp.dashboard.notifications')
-                                </div>
-                            </div>
+
+                            @include('app.mcp.dashboard.notifications')
+
                             <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>

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

@@ -11,7 +11,7 @@ $supplyOrdersPendingHcpApproval = $performer->pro->supplyOrdersPendingHcpApprova
                         <th class="border-0">Date</th>
                         <th class="border-0">Patient</th>
                         <th class="border-0">Product</th>
-                        <th class="border-0">Reason</th>
+                        <th class="border-0">Memo</th>
                         <th class="border-0">Is Cancelled</th>
                         <th class="border-0">Shipment</th>
                     </tr>

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

@@ -10,7 +10,7 @@ $supplyOrdersPendingMyAck = $performer->pro->supplyOrdersPendingMyAckRecordsAsDn
                         <th class="border-0">Date</th>
                         <th class="border-0">Patient</th>
                         <th class="border-0">Product</th>
-                        <th class="border-0">Reason</th>
+                        <th class="border-0">Memo</th>
                         <th class="border-0">Is Cancelled</th>
                         <th class="border-0">Shipment</th>
                         <th class="border-0"></th>

resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -16,7 +16,7 @@
                             <th class="border-0">Date</th>
                             <th class="border-0">Patient</th>
                             <th class="border-0">Product</th>
-                            <th class="border-0">Reason</th>
+                            <th class="border-0">Memo</th>
                             <th class="border-0">Status</th>
                         </tr>
                     </thead>

resources/views/app/mcp/dashboard/appointments-list.blade.php

@@ -8,7 +8,7 @@
             @endif
         </div>
     </div>
-    <div class="card-body p-0 max-height-300px overflow-auto">
+    <div class="card-body p-0 max-height-200px overflow-auto">
         @if(@$appointments && count($appointments))
             <table class="mb-0 table table-sm table-striped appointments border-top-0">
                 @foreach($appointments as $appointment)

resources/views/app/mcp/dashboard/calls_memos.blade.php

@@ -1,6 +1,6 @@
 <div id="mcp-phone-calls-memos">
 @if(!$mcpClientMemos || !count($mcpClientMemos))
-<div class="px-2 py-3">No memos</div>
+<div class="p-2">No memos</div>
 @else
 	<table class="table table-sm table-striped m-0">
 		<tbody>

resources/views/app/mcp/dashboard/messages.blade.php

@@ -1,5 +1,5 @@
 @if(!$incomingSmsMessagesPendingReply || !count($incomingSmsMessagesPendingReply))
-    <div class="px-2 py-3">No messages</div>
+    <div class="p-2">No messages</div>
 @else
     <table class="table table-sm m-0">
         <tbody>

resources/views/app/mcp/dashboard/notifications.blade.php

@@ -1,85 +1,95 @@
-<div id="mcp-dashboard-notifications">
 <?php
-    
-    $apptsPending = [
-        'status' => $pro->getAppointmentsPendingStatusChangeAck(),
-        'decision' => $pro->getAppointmentsPendingDecisionAck(),
-        // 'time' => $pro->getAppointmentsPendingTimeChangeAck()
-    ];
-
+$apptsPending = [
+    'status' => $pro->getAppointmentsPendingStatusChangeAck(),
+    'decision' => $pro->getAppointmentsPendingDecisionAck(),
+    // 'time' => $pro->getAppointmentsPendingTimeChangeAck()
+];
 ?>
-@if(!count($apptsPending['status']) && !count($apptsPending['decision'])/* && !count($apptsPending['time'])*/)
-    <div class="px-2">
-        No appointment changes
-    </div>
-@endif
-@if(count($apptsPending['status']))
-    <div class="px-2">
-        <b class="text-secondary my-2 d-block">Appointment Status Changes</b>
-    </div>
-    @foreach($apptsPending['status'] as $appt)
-        <div class="d-flex mb-1 border-bottom px-2 pb-1" discardable-container>
-            <div class="flex-grow-1 d-inline-flex align-items-baseline">
-                <div>
-                    <a class="d-block" href="/patients/view/{{$appt->client->uid}}"><b>{{$appt->client->displayName()}}</b></a>
-                    <span class="d-block text-sm">{{friendlier_date_time($appt->start_time)}}</span>
-                </div>
-                <div class="ml-auto mr-3 text-right">
-                    <span class="font-weight-bold text-secondary">{{$appt->status}}</span>
-                    @if($appt->status_memo)
-                        <div class="text-secondary text-sm">{{$appt->status_memo}} This is a status memo</div>
-                    @endif
+
+<div id="mcp-dashboard-notifications">
+
+    <div class="card mb-4">
+        <div class="card-header pl-2">
+            <strong>
+                Appointment Status Changes
+            </strong>
+        </div>
+        <div class="card-body p-0">
+            @if(!count($apptsPending['status']))
+                <div class="p-2">
+                    No new changes
                 </div>
-            </div>
-            <div class="">
-                <form url="/api/appointment/acknowledgeStatusAsAppointmentPro" discardable>
-                    <input type="hidden" name="uid" value="{{$appt->uid}}">
-                    <input type="hidden" name="currentStatus" value="{{$appt->status}}">
-                    @if($appt->status_memo !== null)
-                    <input type="hidden" name="currentStatusMemo" value="{{$appt->status_memo}}">
-                    @endif
-                    <input type="hidden" name="currentRawDate" value="{{$appt->raw_date}}">
-                    <input type="hidden" name="currentRawStartTime" value="{{$appt->raw_start_time}}">
-                    <input type="hidden" name="currentRawEndTime" value="{{$appt->raw_end_time}}">
-                    <input type="hidden" name="currentTimezone" value="{{$appt->timezone}}">
-                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
-                </form>
-            </div>
+            @endif
+            @if(count($apptsPending['status']))
+                @foreach($apptsPending['status'] as $appt)
+                    <div class="d-flex mb-1 {{ $loop->last ? '':'border-bottom' }} px-2 py-1" discardable-container>
+                        <div class="flex-grow-1 d-inline-flex align-items-baseline">
+                            <div>
+                                <a class="d-block"
+                                   href="/patients/view/{{$appt->client->uid}}"><b>{{$appt->client->displayName()}}</b></a>
+                                <span class="d-block text-sm">{{friendlier_date_time($appt->start_time)}}</span>
+                            </div>
+                            <div class="ml-auto mr-3 text-right">
+                                <span class="font-weight-bold text-secondary">{{$appt->status}}</span>
+                                @if($appt->status_memo)
+                                    <div class="text-secondary text-sm">{{$appt->status_memo}} This is a status memo
+                                    </div>
+                                @endif
+                            </div>
+                        </div>
+                        <div class="">
+                            <form url="/api/appointment/acknowledgeStatusAsAppointmentPro" discardable>
+                                <input type="hidden" name="uid" value="{{$appt->uid}}">
+                                <input type="hidden" name="currentStatus" value="{{$appt->status}}">
+                                @if($appt->status_memo !== null)
+                                    <input type="hidden" name="currentStatusMemo" value="{{$appt->status_memo}}">
+                                @endif
+                                <input type="hidden" name="currentRawDate" value="{{$appt->raw_date}}">
+                                <input type="hidden" name="currentRawStartTime" value="{{$appt->raw_start_time}}">
+                                <input type="hidden" name="currentRawEndTime" value="{{$appt->raw_end_time}}">
+                                <input type="hidden" name="currentTimezone" value="{{$appt->timezone}}">
+                                <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                            </form>
+                        </div>
+                    </div>
+                @endforeach
+            @endif
         </div>
-    @endforeach
-@endif
-@if(count($apptsPending['decision']))
-    <div class="px-2">
-        <b class="text-secondary my-2 d-block">Appointment Confirmation Changes</b>
     </div>
-    @foreach($apptsPending['decision'] as $appt)
-        <div class="d-flex mb-1 {{ $loop->last ? '':'border-bottom' }} px-2 pb-1" discardable-container>
-            <div class="flex-grow-1 d-inline-flex align-items-baseline">
-                <div>
-                    <a class="d-block" href="/patients/view/{{$appt->client->uid}}"><b>{{$appt->client->displayName()}}</b></a>
-                    <span class="d-block text-sm">{{friendlier_date_time($appt->start_time)}}</span>
-                </div>
-                <span class="ml-auto mr-3 font-weight-bold text-secondary">{{$appt->latestConfirmationDecision->decision_enum}}</span>
-            </div>
-            <div class="">
-                <form url="/api/appointment/acknowledgeDecisionAsAppointmentPro" discardable>
-                    <input type="hidden" name="uid" value="{{$appt->uid}}">
-                    <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
-                </form>
-            </div>
+
+    <div class="card mb-4">
+        <div class="card-header pl-2">
+            <strong>
+                Appointment Confirmation Changes
+            </strong>
         </div>
-    @endforeach
-@endif
-{{--@if(count($apptsPending['time']))
-    <b class="text-secondary my-2 d-block">Appointment Timing Changes</b>
-    @foreach($apptsPending['time'] as $appt)
-        <div class="d-flex mb-1">
-            <b>{{$appt->client->displayName()}}</b>
-            <span class="ml-2">{{friendlier_date_time($appt->start_time)}}</span>
-            <a class="ml-auto">
-                Acknowledge
-            </a>
+        <div class="card-body p-0">
+            @if(!count($apptsPending['decision']))
+                <div class="p-2">
+                    No new changes
+                </div>
+            @endif
+            @if(count($apptsPending['decision']))
+                @foreach($apptsPending['decision'] as $appt)
+                    <div class="d-flex mb-1 {{ $loop->last ? '':'border-bottom' }} px-2 py-1" discardable-container>
+                        <div class="flex-grow-1 d-inline-flex align-items-baseline">
+                            <div>
+                                <a class="d-block"
+                                   href="/patients/view/{{$appt->client->uid}}"><b>{{$appt->client->displayName()}}</b></a>
+                                <span class="d-block text-sm">{{friendlier_date_time($appt->start_time)}}</span>
+                            </div>
+                            <span class="ml-auto mr-3 font-weight-bold text-secondary">{{$appt->latestConfirmationDecision->decision_enum}}</span>
+                        </div>
+                        <div class="">
+                            <form url="/api/appointment/acknowledgeDecisionAsAppointmentPro" discardable>
+                                <input type="hidden" name="uid" value="{{$appt->uid}}">
+                                <button submit class="bg-transparent border-0 p-0 text-primary">Ack.</button>
+                            </form>
+                        </div>
+                    </div>
+                @endforeach
+            @endif
         </div>
-    @endforeach
-@endif--}}
+    </div>
+
 </div>

resources/views/app/mcp/patients-table.blade.php

@@ -7,13 +7,13 @@
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'DOB', 'key' => 'dob'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Age', 'key' => 'age_in_years'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Sex', 'key' => 'sex'])</th>
-				<th class="border-0">Insurance</th>
+				<th class="border-0 text-secondary">Insurance</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Last Visit', 'key' => 'most_recent_completed_mcp_note_date'])</th>
-				<th class="border-0">Next Appt.</th>
-				<th class="border-0">Status</th>
+				<th class="border-0 text-secondary">Next Appt.</th>
+				<th class="border-0 text-secondary">Status</th>
 
-				<th class="border-0">BP</th>
-				<th class="border-0"> <i class="fa fa-heartbeat"></i> @include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => '', 'key' => 'most_recent_cellular_bp_value_irregular'])</th>
+				<th class="border-0 text-secondary">BP</th>
+				<th class="border-0 text-nowrap">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => '<i class="fa fa-heartbeat text-secondary"></i>', 'key' => 'most_recent_cellular_bp_value_irregular'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Pulse', 'key' => 'most_recent_cellular_bp_value_pulse'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'BP/Pulse Timestamp', 'key' => 'most_recent_cellular_bp_measurement_at'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Weight', 'key' => 'most_recent_cellular_weight_value'])</th>
@@ -23,11 +23,11 @@
 				{{-- <th class="border-0">RPM</th>--}}
 				{{-- <th class="border-0 d-none">Last Weight-In</th>--}}
 				{{-- <th class="border-0 d-none">Last BP</th>--}}
-				<th class="border-0">Assigned On</th>
+				<th class="border-0 text-secondary">Assigned On</th>
 
 				@if($pro->pro_type == 'ADMIN')
-				<th class="border-0">MCP</th>
-				<th class="border-0">Initiative</th>
+				<th class="border-0 text-secondary">MCP</th>
+				<th class="border-0 text-secondary">Initiative</th>
 				@endif
 			</tr>
 		</thead>

resources/views/app/mcp/supply_orders.blade.php

@@ -21,7 +21,7 @@
                         <th class="border-0">Date</th>
                         <th class="border-0">Patient</th>
                         <th class="border-0">Product</th>
-                        <th class="border-0">Reason</th>
+                        <th class="border-0">Memo</th>
                         <th class="border-0">Is Cancelled</th>
                         <th class="border-0">Shipment</th>
                     </tr>

resources/views/app/mcp/supply_orders_awaiting_shipment.blade.php

@@ -17,7 +17,7 @@
                     <th class="border-0">Date</th>
                     <th class="border-0">Patient</th>
                     <th class="border-0">Product</th>
-                    <th class="border-0">Reason</th>
+                    <th class="border-0">Memo</th>
                     <th class="border-0">Status</th>
                 </tr>
                 </thead>

resources/views/app/mcp/supply_orders_pending_signature.blade.php

@@ -17,7 +17,7 @@
                     <th class="border-0">Date</th>
                     <th class="border-0">Patient</th>
                     <th class="border-0">Product</th>
-                    <th class="border-0">Reason</th>
+                    <th class="border-0">Memo</th>
                     <th class="border-0">Status</th>
                 </tr>
                 </thead>

resources/views/app/patient/allergies-center.blade.php

@@ -60,7 +60,7 @@ if(!@$summaryView) {
             <thead>
             <tr class="">
                 @if($patient->core_note_id !== $note->id)
-                    <th class="border-bottom-0 text-secondary text-center width-30px text-nowrap">Rel.</th>
+                    <th class="border-bottom-0 text-secondary text-center width-35px text-nowrap pr-1">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>

resources/views/app/patient/care-month/care-month-update-mcp-onboarding-visit-info.blade.php

@@ -2,7 +2,7 @@
 	<a start show>Update</a>
 	<form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
 		<input type="hidden" name="uid" value="{{$patient->uid}}">
-		<div id="updateMcpOnboardingVisit" v-cloak>
+		<div id="updateMcpOnboardingVisit-{{$patient->uid}}" v-cloak>
 		<div class="mb-2">
 			<select name="hasMcpDoneOnboardingVisit" class="form-control form-control-sm" onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')"  v-model="form.hasMcpDoneOnboardingVisit">
 				<option value="">-- Select Status --</option>
@@ -38,43 +38,48 @@
 
 
 <script>
-	var updateMcpOnboardingVisit = new Vue({
-		el:'#updateMcpOnboardingVisit',
-		data:{
-			form:{
-				hasMcpDoneOnboardingVisit: '{{ $patient->has_mcp_done_onboarding_visit }}'
-			},
-			showEnterInfoAlert: false
-		},
-		methods:{
-			initValidation: function(){
-				var self= this;
-				var fields = $('[name=mcpOnboardingVisitNoteUid], [name=reasonOnboardingVisitNoteOutsideSystem]');
-				if(self.form.hasMcpDoneOnboardingVisit == 'YES'){					
-					fields.prop('required', true);
-					fields.on('change keyup', function(){
-						fields.prop('required', false);
-						$(this).prop('required', true);
+	(function() {
+		function init() {
+			new Vue({
+				el:'#updateMcpOnboardingVisit-{{$patient->uid}}',
+				data:{
+					form:{
+						hasMcpDoneOnboardingVisit: '{{ $patient->has_mcp_done_onboarding_visit }}'
+					},
+					showEnterInfoAlert: false
+				},
+				methods:{
+					initValidation: function(){
+						var self= this;
+						var fields = $('[name=mcpOnboardingVisitNoteUid], [name=reasonOnboardingVisitNoteOutsideSystem]');
+						if(self.form.hasMcpDoneOnboardingVisit == 'YES'){
+							fields.prop('required', true);
+							fields.on('change keyup', function(){
+								fields.prop('required', false);
+								$(this).prop('required', true);
+							});
+							self.showEnterInfoAlert = true;
+						}else{
+							fields.prop('required', false);
+							self.showEnterInfoAlert = false;
+						}
+					},
+					init: function(){
+						this.initValidation();
+					}
+				},
+				mounted: function(){
+					this.init();
+				},
+				updated: function(){
+					var self = this;
+
+					self.$nextTick(function(){
+						self.initValidation();
 					});
-					self.showEnterInfoAlert = true;
-				}else{
-					fields.prop('required', false);
-					self.showEnterInfoAlert = false;
 				}
-			},
-			init: function(){
-				this.initValidation();
-			}
-		},
-		mounted: function(){
-			this.init();
-		},
-		updated: function(){
-			var self = this;
-
-			self.$nextTick(function(){
-				self.initValidation();
 			});
 		}
-	});
+		addMCInitializer('updateMcpOnboardingVisit-{{$patient->uid}}', init, '#updateMcpOnboardingVisit-{{$patient->uid}}');
+	}).call(window);
 </script>

resources/views/app/patient/careteam-center.blade.php

@@ -21,7 +21,7 @@ if(!@$careTeamMembers || !@$counts) {
             <thead>
             <tr class="">
                 @if($patient->core_note_id !== $note->id)
-                    <th class="border-bottom-0 text-secondary text-center width-30px text-nowrap">Rel.</th>
+                    <th class="border-bottom-0 text-secondary text-center width-35px text-nowrap pr-1">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name/Details</th>
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>

resources/views/app/patient/goals-center.blade.php

@@ -21,7 +21,7 @@ if(!@$goals || !@$counts) {
             <thead>
             <tr class="">
                 @if($patient->core_note_id !== $note->id)
-                    <th class="border-bottom-0 text-secondary text-center width-30px text-nowrap">Rel.</th>
+                    <th class="border-bottom-0 text-secondary text-center width-35px text-nowrap pr-1">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Goal</th>
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>

resources/views/app/patient/medications-center.blade.php

@@ -50,7 +50,7 @@ if(!@$summaryView) {
             <thead>
             <tr class="">
                 @if($patient->core_note_id !== $note->id)
-                    <th class="border-bottom-0 text-secondary text-center width-30px text-nowrap">Rel.</th>
+                    <th class="border-bottom-0 text-secondary text-center width-35px text-nowrap pr-1">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
                 <th class="border-bottom-0 text-secondary w-30">Subj. Frequency / Experience</th>

resources/views/app/patient/module-specific-summary-renderers/typical_day_lifestyle/subjective.blade.php

@@ -40,24 +40,10 @@ use App\Models\Segment;
 
                     @if(@$contentData["lines"] && count($contentData["lines"]))
                         <table class="table table-sm table-bordered mb-3">
-                            <thead class="bg-light">
-                            <tr>
-                                <th class="border-bottom-0 text-secondary">Subjective</th>
-                                <th class="border-bottom-0 text-secondary w-50">Impression & Plan</th>
-                            </tr>
-                            </thead>
                             <tbody>
                             @foreach(@$contentData["lines"] as $line)
                                 <tr>
                                     <td><pre class="m-0">{{$line['S']}}&nbsp;</pre></td>
-                                    <td>
-                                        <div class="d-flex align-items-baseline">
-                                            @if(@$line['I'])
-                                                <b class="mr-2">{{$line['I']}}</b>
-                                            @endif
-                                            <pre class="m-0">{{$line['P']}}&nbsp;</pre>
-                                        </div>
-                                    </td>
                                 </tr>
                             @endforeach
                             </tbody>

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

@@ -410,6 +410,36 @@ use App\Models\Handout;
                         @endif
                     </div>
                 </div>
+            @elseif(!$note->is_signed_by_hcp && ($note->hcp_pro_id === $pro->id || $note->ally_pro_id === $pro->id))
+                <div class="d-block position-relative on-click-menu mr-2">
+                    <span class="text-sm text-primary c-pointer border px-2 p-1 rounded bg-white">
+                        <i class="fa fa-ellipsis-h"></i>
+                    </span>
+                    <div menu left class="bg-white border">
+                        <a native target="_blank" href="#" class="pl-2 pr-3 pt-1 d-block text-nowrap text-sm"
+                           onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-title>a:first').trigger('click'); return false;">
+                            Edit Title
+                        </a>
+                        <a native target="_blank" href="#" class="pl-2 pr-3 pt-1 d-block text-nowrap text-sm"
+                           onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-date>a:first').trigger('click'); return false;">
+                            Edit Date
+                        </a>
+                        <a native target="_blank" href="#" class="pl-2 pr-3 pt-1 d-block text-nowrap text-sm"
+                           onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-type>a:first').trigger('click'); return false;">
+                            Edit Type
+                        </a>
+                        <a native target="_blank" href="#" class="pl-2 pr-3 pt-1 d-block text-nowrap text-sm"
+                           onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-method>a:first').trigger('click'); return false;">
+                            Edit Method
+                        </a>
+                        @if($note->hcp_pro_id === $pro->id && $note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit')
+                            <a native target="_blank" href="#" class="pl-2 pr-3 py-1 d-block text-nowrap text-sm"
+                               onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-clone>a:first').trigger('click'); return false;">
+                                Clone
+                            </a>
+                        @endif
+                    </div>
+                </div>
             @endif
 
             <div class="px-2 border-left screen-only">
@@ -922,8 +952,106 @@ use App\Models\Handout;
                     @include('app/patient/note/follow-up-appointment')
                 </div>
 
+                <div class="note-content-divider"></div>
+
                 <span class="d-none latest-section-ts">{{ $latestSectionTS }}</span>
 
+                <div class="p-3 border-bottom" data-non-segment-section="ICDs">
+                    <div class="d-flex alignt-items-start">
+                        <div class="d-flex mr-2">
+                            <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
+                            @include('app.patient.partials.put-rm-reasons', ['recordType' => 'NOTE', 'record' => $note])
+                        </div>
+                        <?php
+                        $noteICDData = [
+                            'icd_1' => [
+                                'title' => 'ICD 1',
+                                'reason' => $note->note_reason_icd1,
+                                'description' => $note->note_reason_icd1description
+                            ],
+                            'icd_2' => [
+                                'title' => 'ICD 2',
+                                'reason' => $note->note_reason_icd2,
+                                'description' => $note->note_reason_icd2description
+                            ],
+                            'icd_3' => [
+                                'title' => 'ICD 3',
+                                'reason' => $note->note_reason_icd3,
+                                'description' => $note->note_reason_icd3description
+                            ],
+                            'icd_4' => [
+                                'title' => 'ICD 4',
+                                'reason' => $note->note_reason_icd4,
+                                'description' => $note->note_reason_icd4description
+                            ],
+                        ];
+                        ?>
+                        <div class="d-inline-flex align-items-start flex-wrap mr-auto">
+                            <?php $emptyNoteICDs = true; ?>
+                            @foreach ($noteICDData as $noteICDKey => $noteICD)
+                                <?php
+                                $emptyICD = true;
+                                if(!empty($noteICD['reason']) || !empty($noteICD['description'])){
+                                    $emptyNoteICDs = false;
+                                    $emptyICD = false;
+                                }
+                                ?>
+                                @if(!$emptyICD)
+                                    <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
+                                @endif
+                            @endforeach
+                            @if($emptyNoteICDs)
+                                <small class="text-dark">-</small>
+                            @endif
+                        </div>
+                        <div class="on-hover-show d-block on-hover-opaque position-relative mx-1">
+                            <i class="fa fa-info-circle"></i>
+                            <div class="on-hover-content p-0 border-0 max-width-unset bg-white">
+                                <table class="table table-sm m-0 table-bordered border-0">
+                                    <thead>
+                                    <tr class="bg-light">
+                                        <th class="border-bottom-0">Created</th>
+                                        <th class="min-width-140px border-bottom-0">Reason 1</th>
+                                        <th class="min-width-140px border-bottom-0">Reason 2</th>
+                                        <th class="min-width-140px border-bottom-0">Reason 3</th>
+                                        <th class="min-width-140px border-bottom-0">Reason 4</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    @foreach($note->reasonsLog as $log)
+                                        <tr>
+                                            <td class="text-nowrap">{{friendly_date_time($log->created_at)}}</td>
+                                            <td>
+                                                {{$log->note_reason_icd1}}
+                                                <div class="text-sm text-secondary">{{$log->note_reason_icd1description}}</div>
+                                            </td>
+                                            <td>
+                                                {{$log->note_reason_icd2}}
+                                                <div class="text-sm text-secondary">{{$log->note_reason_icd2description}}</div>
+                                            </td>
+                                            <td>
+                                                {{$log->note_reason_icd3}}
+                                                <div class="text-sm text-secondary">{{$log->note_reason_icd3description}}</div>
+                                            </td>
+                                            <td>
+                                                {{$log->note_reason_icd4}}
+                                                <div class="text-sm text-secondary">{{$log->note_reason_icd4description}}</div>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div></div>
+                    </div>
+                    @if(!empty($note->note_reason_memo))
+                        <div style="padding-left: 60px;">
+                            <small><b>Reason:</b> {{ $note->note_reason_memo }}</small>
+                        </div>
+                    @endif
+                </div>
+
                 <!-- handouts -->
                 <div class="p-3 border-bottom screen-only" data-non-segment-section="Handouts">
                     <?php
@@ -1027,7 +1155,7 @@ use App\Models\Handout;
                                     <thead>
                                     <tr class="bg-light">
                                         <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
-                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Memo</div></th>
                                         <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
                                         <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
                                         <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
@@ -1208,102 +1336,6 @@ use App\Models\Handout;
                     </script>
                 </div>
 
-                <div class="px-2 pt-2 pb-1 border-bottom" data-non-segment-section="ICDs">
-                    <div class="d-flex alignt-items-start">
-                        <div class="d-flex mr-2">
-                            <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
-                            @include('app.patient.partials.put-rm-reasons', ['recordType' => 'NOTE', 'record' => $note])
-                        </div>
-                        <?php
-                            $noteICDData = [
-                                'icd_1' => [
-                                    'title' => 'ICD 1',
-                                    'reason' => $note->note_reason_icd1,
-                                    'description' => $note->note_reason_icd1description
-                                ],
-                                'icd_2' => [
-                                    'title' => 'ICD 2',
-                                    'reason' => $note->note_reason_icd2,
-                                    'description' => $note->note_reason_icd2description
-                                ],
-                                'icd_3' => [
-                                    'title' => 'ICD 3',
-                                    'reason' => $note->note_reason_icd3,
-                                    'description' => $note->note_reason_icd3description
-                                ],
-                                'icd_4' => [
-                                    'title' => 'ICD 4',
-                                    'reason' => $note->note_reason_icd4,
-                                    'description' => $note->note_reason_icd4description
-                                ],
-                            ];
-                        ?>
-                        <div class="d-inline-flex align-items-start flex-wrap mr-auto">
-                            <?php $emptyNoteICDs = true; ?>
-                                @foreach ($noteICDData as $noteICDKey => $noteICD)
-                                    <?php
-                                        $emptyICD = true;
-                                        if(!empty($noteICD['reason']) || !empty($noteICD['description'])){
-                                            $emptyNoteICDs = false;
-                                            $emptyICD = false;
-                                        }
-                                    ?>
-                                    @if(!$emptyICD)
-                                        <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
-                                    @endif
-                                @endforeach
-                            @if($emptyNoteICDs)
-                                <small class="text-dark">-</small>
-                            @endif
-                        </div>
-                        <div class="on-hover-show d-block on-hover-opaque position-relative mx-1">
-                            <i class="fa fa-info-circle"></i>
-                            <div class="on-hover-content p-0 border-0 max-width-unset bg-white">
-                                <table class="table table-sm m-0 table-bordered border-0">
-                                    <thead>
-                                    <tr class="bg-light">
-                                        <th class="border-bottom-0">Created</th>
-                                        <th class="min-width-140px border-bottom-0">Reason 1</th>
-                                        <th class="min-width-140px border-bottom-0">Reason 2</th>
-                                        <th class="min-width-140px border-bottom-0">Reason 3</th>
-                                        <th class="min-width-140px border-bottom-0">Reason 4</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    @foreach($note->reasonsLog as $log)
-                                        <tr>
-                                            <td class="text-nowrap">{{friendly_date_time($log->created_at)}}</td>
-                                            <td>
-                                                {{$log->note_reason_icd1}}
-                                                <div class="text-sm text-secondary">{{$log->note_reason_icd1description}}</div>
-                                            </td>
-                                            <td>
-                                                {{$log->note_reason_icd2}}
-                                                <div class="text-sm text-secondary">{{$log->note_reason_icd2description}}</div>
-                                            </td>
-                                            <td>
-                                                {{$log->note_reason_icd3}}
-                                                <div class="text-sm text-secondary">{{$log->note_reason_icd3description}}</div>
-                                            </td>
-                                            <td>
-                                                {{$log->note_reason_icd4}}
-                                                <div class="text-sm text-secondary">{{$log->note_reason_icd4description}}</div>
-                                            </td>
-                                        </tr>
-                                    @endforeach
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                        <div></div>
-                    </div>
-                    @if(!empty($note->note_reason_memo))
-                        <div style="padding-left: 60px;">
-                            <small><b>Reason:</b> {{ $note->note_reason_memo }}</small>
-                        </div>
-                    @endif
-                </div>
-
                 @if(!$note->is_non_medical || true)
                     @if($pro->pro_type === 'ADMIN')
                     <div class="p-3 border-bottom screen-only" data-non-segment-section="Bills & Claims Summary">

resources/views/app/patient/note/lhs-tree.blade.php

@@ -46,6 +46,7 @@
     ?>
 
     <hr>
+    <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="ICDs" href="#">ICDs</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Handouts" href="#">Handouts</a></div>
     @if(!$note->is_non_medical || true)
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Prescriptions" href="#">ERx &amp; Orders</a></div>
@@ -54,7 +55,6 @@
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Remote Monitoring" href="#">Remote Monitoring</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Supply Orders Summary" href="#">Supply Orders Summary</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Vitals Settings" href="#">Vitals Settings</a></div>
-    <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="ICDs" href="#">ICDs</a></div>
     @if(!$note->is_non_medical || true)
         @if($pro->pro_type === 'ADMIN')
             <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Bills & Claims Summary" href="#">Bills & Claims Summary</a></div>

resources/views/app/patient/note/partials/cpp-bills-claims-container.blade.php

@@ -575,7 +575,6 @@
                     <th class="border-bottom-0 pl-3">NA</th>
                 @endif
                 <th class="border-bottom-0 w-25 pl-3">Service</th>
-                {{--<th class="border-bottom-0 w-25 pl-2">Reason</th>--}}
                 <th class="border-bottom-0 pl-3">Billable</th>
                 <th class="border-bottom-0 pl-2">Amount</th>
                 <th class="border-bottom-0 pl-2">Verification</th>
@@ -590,10 +589,6 @@
                         <td class="pl-3">{{ $note->allyPro->displayName() }}</td>
                     @endif
                     <td class="pl-3 {{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
-                    {{--<td class="pl-2">
-                        {{ $bill->reason1 }}
-                        <div class="text-secondary small">{{ $bill->reason2 }}</div>
-                    </td>--}}
                     <td class="pl-3">
                         @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
                             <?php

resources/views/app/patient/note/rhs-sidebar.blade.php

@@ -51,6 +51,9 @@
         @endif
     </div>
 
+    <!-- MRV DT & DDI -->
+    @include('app.patient.segment-templates.medrisk_vigilence.dt_ddi_short', ['note' => $note, 'patient' => $patient, 'segment' => $note->coreSegment])
+
     <?php
     $allergies = \App\Models\Point::getPointsOfCategory($patient, "ALLERGY");
     $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
@@ -61,7 +64,7 @@
     $tracker = \App\Models\Point::getGlobalSingletonOfCategory($patient, 'NO_KNOWN_TRACKER');
     ?>
     <div id="active-allergies"
-         class="p-2 border-bottom c-pointer on-hover-aliceblue {{$note->is_signed_by_hcp ? 'events-none' : ''}}"
+         class="p-2 border-bottom c-pointer on-hover-aliceblue"
          open-in-stag-popup
          mc-initer="allergies-center-{{$note->id}}"
          title="Allergies Center"

resources/views/app/patient/prescriptions/list.blade.php

@@ -39,10 +39,10 @@
                 <tr>
                     <th class="border-0 text-secondary width-150px">Created</th>
                     <th class="border-0 text-secondary" :class="currentPrescription ? 'width-200px' : ''">Clinical</th>
-                    <th v-if="!currentPrescription">Prescriber</th>
-                    <th v-if="!currentPrescription">Status</th>
-                    <th v-if="!currentPrescription">Sign</th>
-                    <th v-if="!currentPrescription">Client Status</th>
+                    <th v-if="!currentPrescription" class="border-0 text-secondary">Prescriber</th>
+                    <th v-if="!currentPrescription" class="border-0 text-secondary">Status</th>
+                    <th v-if="!currentPrescription" class="border-0 text-secondary">Sign</th>
+                    <th v-if="!currentPrescription" class="border-0 text-secondary">Client Status</th>
                 </tr>
                 </thead>
                 <tbody>

resources/views/app/patient/segment-templates/_child_review/medication/edit-review-in-place-optimized.php

@@ -9,14 +9,14 @@
                 <label class="text-sm mb-0 font-weight-bold text-secondary">Frequency</label>
                 <input type="text"
                        data-name="value"
-                       value="<?= @($currentChildReview->data->value) ? trim(strip_tags($currentChildReview->data->value)) : '' ?>"
+                       value="<?= @($currentChildReview->data->value) ? trim(strip_tags($currentChildReview->data->value)) : (@($previousChildReview->data->value) ? trim(strip_tags($previousChildReview->data->value)) : '') ?>"
                        class="form-control form-control-sm min-width-unset">
             </div>
             <div class="mb-2">
                 <label class="text-sm mb-0 font-weight-bold text-secondary">Experience</label>
                 <input type="text"
                        data-name="experience"
-                       value="<?= @($currentChildReview->data->experience) ?>"
+                       value="<?= @($currentChildReview->data->experience) ? trim(strip_tags($currentChildReview->data->experience)) : (@($previousChildReview->data->experience) ? trim(strip_tags($previousChildReview->data->experience)) : '') ?>"
                        class="form-control form-control-sm min-width-unset">
             </div>
 

resources/views/app/patient/segment-templates/_child_review/medication/edit-review-optimized.php

@@ -13,14 +13,14 @@
             <label class="text-sm mb-0 font-weight-bold text-secondary">Frequency</label>
             <input type="text"
                    data-name="value"
-                   value="<?= @($currentChildReview->data->value) ? trim(strip_tags($currentChildReview->data->value)) : '' ?>"
+                   value="<?= @($currentChildReview->data->value) ? trim(strip_tags($currentChildReview->data->value)) : (@($previousChildReview->data->value) ? trim(strip_tags($previousChildReview->data->value)) : '') ?>"
                    class="form-control form-control-sm min-width-unset">
         </div>
         <div class="mb-2">
             <label class="text-sm mb-0 font-weight-bold text-secondary">Experience</label>
             <input type="text"
                    data-name="experience"
-                   value="<?= @($currentChildReview->data->experience) ?>"
+                   value="<?= @($currentChildReview->data->experience) ? trim(strip_tags($currentChildReview->data->experience)) : (@($previousChildReview->data->experience) ? trim(strip_tags($previousChildReview->data->experience)) : '') ?>"
                    class="form-control form-control-sm min-width-unset">
         </div>
 

resources/views/app/patient/segment-templates/history_surgical/summary.blade.php

@@ -66,7 +66,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
                 <div>
                     <!--Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/medrisk_vigilence/dt_ddi_short.blade.php

@@ -0,0 +1,48 @@
+<?php
+
+// info from patient chart
+$drugsMRV = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
+
+// filter out drugs without fdb info on them
+$drugsMRV = $drugsMRV->filter(function($_drug) {
+    return @$_drug->data &&
+        $_drug->data->name &&
+        $_drug->data->medId &&
+        $_drug->data->routedMedId &&
+        $_drug->data->routedDosageFormMedId &&
+        $_drug->data->gcnSeqno;
+});
+
+// dpt
+$dptInfo = duplicate_therapy_info($drugsMRV);
+
+// ddi
+$ddi = drug_drug_interaction_info($drugsMRV);
+
+?>
+@if(!!$dptInfo || !!$ddi)
+
+    <div native target="_blank"
+         class="p-2 border-bottom c-pointer on-hover-aliceblue {{$note->is_signed_by_hcp ? 'events-none' : ''}} mrv-sidebar"
+         open-in-stag-popup
+         title="Medrisk Vigilence"
+         popup-style="overflow-visible mrv-content"
+         href="/mrv-summary/{{$note->uid}}">
+
+        @if(!!$dptInfo)
+            <p class="font-weight-bold mb-2">Duplicate Therapy</p>
+            <div class="my-2 text-sm text-nowrap mw-100 text-ellipsis no-bold-children">
+                {!! $dptInfo !!}
+            </div>
+        @endif
+
+        @if(!!$ddi)
+            <p class="font-weight-bold mb-2">Drug-Drug Interaction</p>
+            <div class="mt-2 text-sm text-nowrap mw-100 text-ellipsis no-bold-children">
+                {!! $ddi !!}
+            </div>
+        @endif
+
+    </div>
+
+@endif

resources/views/app/patient/segment-templates/omega_history_social/summary.blade.php

@@ -74,7 +74,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                 <div>
                     Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/omega_history_surgical/summary.blade.php

@@ -68,7 +68,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                 <div>
                     <!--Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/past_medical_history/summary.blade.php

@@ -104,7 +104,7 @@ if ($contentData) {
                 <div>
                     Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/sigma_history_past_medical/summary.blade.php

@@ -106,7 +106,7 @@ if ($contentData) {
                 <div>
                     Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/sigma_history_social/summary.blade.php

@@ -71,7 +71,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                 <div>
                     Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/sigma_history_surgical/summary.blade.php

@@ -68,7 +68,7 @@ if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point-
                 <div>
                     <!--Custom
                     <i class="fa fa-arrow-right text-sm text-secondary"></i>-->
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                    <span class="font-weight-normal"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>

resources/views/app/patient/segment-templates/typical_day_lifestyle/edit.blade.php

@@ -31,7 +31,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 }
 ?>
 
-<div visit-moe no-auto-save close-on-save close-on-cancel class="d-block p-3" id="typical_day_lifestyle-{{$note->id}}">
+<div visit-moe no-auto-save close-on-save close-on-cancel class="d-block" id="typical_day_lifestyle-{{$note->id}}">
     <form show url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 frm-upsert-review-typical-day-ls">
         <input type="hidden" name="uid" value="<?= $point->uid ?>">
         <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
@@ -41,21 +41,11 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
         <p class="mb-2 font-weight-bold">Typical Day</p>
 
         <table class="table table-sm table-bordered mb-2 stag-sheet allow-row-addition mb-3" lines>
-            <thead class="bg-light">
-            <tr>
-                <th class="border-bottom-0 text-secondary width-30px"></th>
-                <th class="border-bottom-0 text-secondary">Subjective</th>
-                <th class="border-bottom-0 text-secondary width-100px">Impression</th>
-                <th class="border-bottom-0 text-secondary w-50">Plan</th>
-            </tr>
-            </thead>
             <tbody>
                 @foreach(@$contentData["lines"] as $line)
                     <tr>
-                        <td class="align-middle text-center bg-light"><a href="#" class="delete-line"><i class="fa fa-trash-alt on-hover-opaque text-danger"></i></a></td>
+                        <td class="align-middle text-center bg-light width-30px"><a href="#" class="delete-line"><i class="fa fa-trash-alt on-hover-opaque text-danger"></i></a></td>
                         <td><textarea rows="1" key="S">{{@$line['S']}}</textarea></td>
-                        <td><textarea rows="1" key="I">{{@$line['I']}}</textarea></td>
-                        <td><textarea rows="1" key="P">{{@$line['P']}}</textarea></td>
                     </tr>
                 @endforeach
             </tbody>
@@ -139,9 +129,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 
             function newRow() {
                 return $('<tr><td class="align-middle text-center bg-light"><a href="#" class="delete-line"><i class="fa fa-trash-alt on-hover-opaque text-danger"></i></a></td>' +
-                    '<td><textarea rows="1" key="S"></textarea></td>' +
-                    '<td><textarea rows="1" key="I"></textarea></td>' +
-                    '<td><textarea rows="1" key="P"></textarea></td></tr>');
+                    '<td><textarea rows="1" key="S"></textarea></td></tr>');
             }
 
             function createAndMoveToNextRowInput(_td) {

resources/views/app/patient/segment-templates/typical_day_lifestyle/log.blade.php

@@ -17,17 +17,10 @@ if($point) {
                 <p class="mb-2 font-weight-bold">Typical Day</p>
                 @if(@$contentData["lines"] && count($contentData["lines"]))
                     <table class="table table-sm table-bordered mb-3">
-                        <thead class="bg-light">
-                        <tr>
-                            <th class="border-bottom-0 text-secondary">Subjective</th>
-                            <th class="border-bottom-0 text-secondary w-50">Impression & Plan</th>
-                        </tr>
-                        </thead>
                         <tbody>
                         @foreach(@$contentData["lines"] as $line)
                             <tr>
                                 <td><pre class="m-0">{{$line['S']}}</pre></td>
-                                <td><pre class="m-0">{{$line['P']}}</pre></td>
                             </tr>
                         @endforeach
                         </tbody>

resources/views/app/patient/segment-templates/typical_day_lifestyle/summary.blade.php

@@ -35,7 +35,7 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 $hasTypicalDayData = false;
 if(@$contentData["lines"] && count($contentData["lines"])) {
     foreach(@$contentData["lines"] as $line) {
-        if(!!@$line['S'] && (!!@$line['I'] || !!@$line['P'])) {
+        if(!!@$line['S']) {
             $hasTypicalDayData = true;
             break;
         }
@@ -56,25 +56,11 @@ $hasDailyAggregates = (
     @if($hasTypicalDayData)
         <div class="mb-1 font-weight-bold">Typical Day</div>
         <table class="table table-sm table-bordered mb-3">
-            <thead class="bg-light">
-            <tr>
-                <th class="border-bottom-0 text-secondary">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-50">Impression & Plan</th>
-            </tr>
-            </thead>
             <tbody>
             @foreach(@$contentData["lines"] as $line)
                 @if($line['S'])
                 <tr>
                     <td><pre class="m-0">{{$line['S']}}&nbsp;</pre></td>
-                    <td>
-                        <div class="d-flex align-items-baseline">
-                            @if(@$line['I'])
-                                <b class="mr-2">{{$line['I']}}</b>
-                            @endif
-                            <pre class="m-0">{{$line['P']}}&nbsp;</pre>
-                        </div>
-                    </td>
                 </tr>
                 @endif
             @endforeach

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

@@ -33,7 +33,7 @@
                         <thead class="bg-light">
                         <tr class="">
                             <th class="border-0 text-nowrap text-secondary">Title</th>
-                            <th class="border-0 text-nowrap text-secondary">Reason</th>
+                            <th class="border-0 text-nowrap text-secondary">Memo</th>
                             @if(!$shipment)
                                 <th class="border-0 text-nowrap text-secondary">Created At</th>
                                 <th class="border-0 text-nowrap text-secondary">Pro Signed?</th>

resources/views/app/patient/supplements-center.blade.php

@@ -19,7 +19,7 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
             <thead>
             <tr class="">
                 @if($patient->core_note_id !== $note->id)
-                <th class="border-bottom-0 text-secondary text-center width-30px text-nowrap">Rel.</th>
+                <th class="border-bottom-0 text-secondary text-center width-35px text-nowrap pr-1">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
                 <th class="border-bottom-0 text-secondary width-50px">Edit</th>

resources/views/app/practice-management/_sort_header.blade.php

@@ -1,9 +1,16 @@
 <div class="d-flex align-items-end flex-wrap">
     <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'sort_dir'])}}&sort_by={{$key}}&sort_dir={{request()->input('sort_by') === $key && request()->input('sort_dir') === 'ASC' ? 'DESC' : 'ASC'}}" class="text-decoration-none">
         <b class="{{request()->input('sort_by') === $key ? 'text-primary' : 'text-secondary'}}">{!! $label !!}</b>
-        <span class="ml-1 d-inline-flex align-items-baseline">
-            <i class="text-sm fa fa-chevron-up {{request()->input('sort_by') === $key && request()->input('sort_dir') === 'DESC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
-            <i class="ml-1 text-sm fa fa-chevron-down {{request()->input('sort_by') === $key && request()->input('sort_dir') === 'ASC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
+        <span class="d-inline-flex align-items-baseline">
+            @if(request()->input('sort_by') !== $key)
+                <i class="ml-1 text-sm fa fa-chevron-down on-hover-opaque text-secondary"></i>
+            @else
+                @if(request()->input('sort_dir') === 'DESC')
+                    <i class="ml-1 text-sm fa fa-chevron-up"></i>
+                @else
+                    <i class="ml-1 text-sm fa fa-chevron-down"></i>
+                @endif
+            @endif
         </span>
     </a>
     @if(request()->input('sort_by') === $key)

resources/views/app/practice-management/supply-orders.blade.php

@@ -28,7 +28,7 @@
                         <tr>
                             <th class="border-0">Client</th>
                             <th class="border-0">Product</th>
-                            <th class="border-0">Reason</th>
+                            <th class="border-0">Memo</th>
                             <th class="border-0">Client Understanding Memo</th>
                             <th class="border-0">Pro Sign</th>
                             <th class="border-0">Client Sign</th>

resources/views/layouts/patient-header-meta-info.blade.php

@@ -0,0 +1,68 @@
+<div>
+<div class="">
+    @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+        <span class="text-dark d-inline-flex align-items-center">
+              <span class="mr-2">
+                <i class="fa fa-exclamation-triangle"></i>
+                <span>MCP Onboarding Visit Pending</span>
+              </span>
+            </span>
+        @include('app.patient.partials.update-mcp-onboarding-visit-info')
+    @endif
+</div>
+@if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
+    <div class="">
+        <label>Follow-up Freq (days):</label>
+        <span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
+        <div moe relative class="ml-2">
+            <a href="#" start show class="text-sm"><i class="fa fa-edit on-hover-opaque"></i></a>
+            <form url="/api/client/putMcpUsualFollowUpFrequencyInDays">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                    <label class="text-sm text-secondary mb-1 text-nowrap">Follow-up Frequency (days)</label>
+                    <input type="number" required name="mcpUsualFollowUpFrequencyInDays" class="form-control form-control-sm" value="{{@$patient->mcp_usual_follow_up_frequency_in_days}}">
+                </div>
+                <div class="d-flex align-items-center">
+                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+@endif
+<?php $_cpc = $patient->getPrimaryCoverage();?>
+<div class="d-flex">
+    <div>DOB: {{friendly_date($patient->dob, false,null, true)}} </div>
+    @if($_cpc && $patient->getPrimaryCoverageStatus() === 'YES')
+        <div class="text-nowrap screen-only ml-2 pl-2 border-left">
+            <a href="{{ route('patients.view.primary-coverage', $patient) }}">{{$_cpc->insuranceDisplayPayerName()}}</a>
+            <span class="on-hover-show d-inline-block on-hover-opaque">
+                <i class="fa fa-check-circle text-success"></i>
+                <div class="on-hover-content py-2 pl-3 text-nowrap">
+                  Covered
+                </div>
+              </span>
+            @if($_cpc->is_manually_determined)
+                <a href="{{ route('patients.view.primary-coverage', $patient) }}" class="on-hover-show">
+                    <i class="ml-1 fas fa-code-branch text-info"></i>
+                    <div class="on-hover-content py-2 pl-3 text-nowrap">
+                        Manually determined at {{ friendly_date($_cpc->created_at) }}
+                    </div>
+                </a>
+            @endif
+        </div>
+        @if($performer->pro->pro_type == 'ADMIN')
+            @if($_cpc->plan_type === 'MEDICARE')
+                @if(@$patient->mpb_remaining !== null)
+                    <div class="ml-2">Deductible: {{format_number(@$patient->mpb_remaining)}} </div>
+                @endif
+            @endif
+            @if($_cpc->plan_type === 'COMMERCIAL')
+
+                <div class="ml-2">Deductible: {{@$_cpc->deductible_amount}} </div>
+
+            @endif
+        @endif
+    @endif
+</div>
+</div>

resources/views/layouts/patient-header.blade.php

@@ -2,7 +2,8 @@
 $thumbnail = $patient->profile_picture_base64;
 $initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
 $online = $patient->is_online ? 'online' : '';
-$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
+$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first])) .
+        ($patient->name_nickname ? ' (' . $patient->name_nickname . ')' : '');
 
 $confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
 $hasConfirmedEmail = empty($patient->email_address) ? false:true;
@@ -54,8 +55,46 @@ $addressParts .= implode(", ", $addressPart2);
   @endif
   <div class="d-flex justify-content-between pt-2 {{request()->route()->getName() === 'patients.view.notes.view.dashboard' ? 'sticky-note-header' : ''}}" id="patient-top-most-header">
     <div class="d-flex align-items-center header-info mb-2">
-      <h6 class="font-weight-bold">{{$patientName}},</h6>
-      <h6 class="ml-2">{{$patient->age_in_years}} Y, {{$patient->sex}}</h6>
+
+      <h6 class="font-weight-bold">{{$patientName}}</h6>
+      <div moe wide class="ml-2">
+        <a start show><i class="fa fa-edit"></i></a>
+        <form url="/api/client/editName" class="mcp-theme-1">
+          <input type="hidden" name="uid" value="{{$patient->uid}}">
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="namePrefix" placeholder="Name Prefix" value="{{$patient->name_prefix}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameFirst" placeholder="Name First" value="{{$patient->name_first}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameMiddle" placeholder="Name Middle" value="{{$patient->name_middle}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameLast" placeholder="Name Last" value="{{$patient->name_last}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameSuffix" placeholder="Name Suffix" value="{{$patient->name_suffix}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameCredential" placeholder="Name Credential" value="{{$patient->name_credential}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameNickname" placeholder="Name Nickname" value="{{$patient->name_nickname}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="nameMaiden" placeholder="Name Maiden" value="{{$patient->name_maiden}}">
+          </div>
+          <div class="mb-2">
+            <input type="text" class="form-control form-control-sm" name="namePrevious" placeholder="Name Previous" value="{{$patient->name_previous}}">
+          </div>
+          <div>
+            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+          </div>
+        </form>
+      </div>
+      <h6 class="ml-3">{{$patient->age_in_years}} Y, {{$patient->sex}}</h6>
       <h6 class="d-inline-flex align-items-baseline ml-2">
         <span><i class="chart mr-2">#{{$patient->chart_number}}</i></span>
         <span class="on-hover-show d-inline-block on-hover-opaque">
@@ -150,6 +189,8 @@ $addressParts .= implode(", ", $addressPart2);
       </div>
   </div>
 
+  <?php $hasCoverageColumn = !$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES'; ?>
+
   <div class="flex-header text-dark">
     <div class="d-flex bg-light p-2 border">
       <!-- <div class="">
@@ -304,82 +345,22 @@ $addressParts .= implode(", ", $addressPart2);
               </div>
             @include('app.patient.partials.quick-actions-buttons')
           </div>
-
-          <div class="">
-            @if($patient->has_mcp_done_onboarding_visit !== 'YES')
-            <span class="text-dark d-inline-flex align-items-center">
-              <span class="mr-2">
-                <i class="fa fa-exclamation-triangle"></i>
-                <span>MCP Onboarding Visit Pending</span>
-              </span>
-            </span>
-            @include('app.patient.partials.update-mcp-onboarding-visit-info')
-            @endif
-          </div>
-        </div>
-        @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
-        <div class="">
-          <label>Follow-up Freq (days):</label>
-          <span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
-          <div moe relative class="ml-2">
-            <a href="#" start show class="text-sm"><i class="fa fa-edit on-hover-opaque"></i></a>
-            <form url="/api/client/putMcpUsualFollowUpFrequencyInDays">
-              <input type="hidden" name="uid" value="{{$patient->uid}}">
-              <div class="mb-2">
-                <label class="text-sm text-secondary mb-1 text-nowrap">Follow-up Frequency (days)</label>
-                <input type="number" required name="mcpUsualFollowUpFrequencyInDays" class="form-control form-control-sm" value="{{@$patient->mcp_usual_follow_up_frequency_in_days}}">
-              </div>
-              <div class="d-flex align-items-center">
-                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-              </div>
-            </form>
-          </div>
         </div>
+
+        @if($hasCoverageColumn)
+          @include('layouts.patient-header-meta-info')
         @endif
-        <?php $_cpc = $patient->getPrimaryCoverage();?>
-        <div class="d-flex">
-          <div>DOB: {{friendly_date($patient->dob, false,null, true)}} </div>
-          @if($_cpc && $patient->getPrimaryCoverageStatus() === 'YES')
-            <div class="text-nowrap screen-only ml-2 pl-2 border-left">
-              <a href="{{ route('patients.view.primary-coverage', $patient) }}">{{$_cpc->insuranceDisplayPayerName()}}</a>
-              <span class="on-hover-show d-inline-block on-hover-opaque">
-                <i class="fa fa-check-circle text-success"></i>
-                <div class="on-hover-content py-2 pl-3 text-nowrap">
-                  Covered
-                </div>
-              </span> 
-                @if($_cpc->is_manually_determined)
-                <a href="{{ route('patients.view.primary-coverage', $patient) }}" class="on-hover-show">
-                  <i class="ml-1 fas fa-code-branch text-info"></i>
-                  <div class="on-hover-content py-2 pl-3 text-nowrap">
-                    Manually determined at {{ friendly_date($_cpc->created_at) }}
-                </div>
-                </a>
-                @endif
-            </div>
-            @if($performer->pro->pro_type == 'ADMIN')
-              @if($_cpc->plan_type === 'MEDICARE')
-                @if(@$patient->mpb_remaining !== null)
-                  <div class="ml-2">Deductible: {{format_number(@$patient->mpb_remaining)}} </div>
-                @endif
-              @endif
-              @if($_cpc->plan_type === 'COMMERCIAL')
-                
-                  <div class="ml-2">Deductible: {{@$_cpc->deductible_amount}} </div>
-                
-              @endif
-            @endif 
-          @endif
-        </div>
       </div>
     </div>
 
-
-    @if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
+    @if($hasCoverageColumn)
     <div class="d-flex bg-light p-2 border header-coverage-status" style="max-width: 305px;">
       @include('app.patient.coverage-status')
     </div>
+    @else
+      <div class="d-flex bg-light p-2 border header-coverage-status" style="max-width: 350px;">
+        @include('layouts.patient-header-meta-info')
+      </div>
     @endif
     <div class="bg-light p-2 border d-none">
       @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
@@ -579,3 +560,51 @@ $addressParts .= implode(", ", $addressPart2);
   @endif
 @endif
 
+<?php
+if($patient->latest_vitals_json) {
+  try {
+    $parsed = json_decode($patient->latest_vitals_json);
+    ?>
+    <div class="mx-2 mb-2 p-2 mcp-theme-1 rounded-0 border bg-aliceblue">
+      <div class="d-flex align-items-baseline flex-wrap">
+        <div class="mr-2 font-weight-bold text-secondary">Latest Vitals @if($patient->latest_vitals_set_at)({{friendly_date($patient->latest_vitals_set_at)}})@endif:</div>
+        <?php $hasPre = false; ?>
+        @if($parsed->heightInInches)
+          <div>Height {{toFeetAndInches($parsed->heightInInches, "'", '"')}}</div>
+          <?php $hasPre = true; ?>
+        @endif
+        @if($parsed->weightPounds)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>Weight {{$parsed->weightPounds}} lbs</div>
+        @endif
+        @if($parsed->bmi)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>BMI {{$parsed->bmi}}</div>
+        @endif
+        @if($parsed->temperatureF)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>Temp. {{$parsed->bmi}} F</div>
+        @endif
+        @if($parsed->systolicBP && $parsed->diastolicBP)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>BP {{$parsed->systolicBP}}/{{$parsed->diastolicBP}}</div>
+        @endif
+        @if($parsed->pulseRatePerMinute)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>Pulse {{$parsed->pulseRatePerMinute}}/m</div>
+        @endif
+        @if($parsed->respirationRatePerMinute)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>Resp. {{$parsed->respirationRatePerMinute}}/m</div>
+        @endif
+        @if($parsed->smokingStatus)
+          @if($hasPre)<span class="mr-2">,</span>@endif
+          <div>{{$parsed->smokingStatus}}</div>
+        @endif
+      </div>
+    </div>
+    <?php
+  }
+  catch (Exception $ex) {}
+}
+?>

resources/views/layouts/patient.blade.php

@@ -307,7 +307,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 				</div>
 				<?php $iCM = $patient->isAwaitingRMCommunicationFromMCP(); ?>
 				@if($iCM !== FALSE)
-					<div class="d-block my-0 mx-2 p-2 alert alert-warning mcp-theme-1 border border-warning text-dark">
+					<div class="d-block mb-2 mx-2 p-2 alert alert-warning mcp-theme-1 border border-warning text-dark rounded-0 ">
 						<span class="font-size-13">
 							<i class="fa fa-exclamation-triangle mr-1"></i>
 							This patient has not had RPM-related interactive communication this month. Please document interactive time
@@ -322,7 +322,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 					</div>
 				@endif
 				@if($pro->pro_type === 'ADMIN')
-				<div class="screen-only {{$iCM !== FALSE ? 'mt-2' : ''}} card-header py-2 d-flex align-items-start justify-content-between mcp-theme-1 bg-aliceblue hide-inside-popup">
+				<div class="screen-only p-2 d-flex align-items-start justify-content-between mcp-theme-1 bg-aliceblue hide-inside-popup border-top">
 					<div class="d-flex align-items-center">
 						<b class="">Tags ({{count($patient->clientTags)}}):</b>
 					@foreach($patient->clientTags as $tag)
@@ -380,7 +380,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 			</div>
 			@endif
 	</div>--}}
-	<div class="card-body {{$routeName === 'patients.view.notes.view.dashboard' ? 'p-0' : ''}}">
+	<div class="card-body {{$routeName === 'patients.view.notes.view.dashboard' ? 'p-0' : ''}} border-top">
 		{{--<h1 class="h3">@yield('section-title')</h1>--}}
 		<div class="mcp-theme-1">
 			@yield('inner-content')