Merge branch 'dev' into dev-vj

app/Http/Controllers/AdminController.php

@@ -463,4 +463,75 @@ class AdminController extends Controller
         return view('app.admin.bdt_devices', compact('bdtDevices', 'filters'));
     }
 
+    public function patientsMissingDefasultSettings(Request $request){
+        $filters = $request->all();
+        $patients = Client::whereNull('shadow_pro_id');
+
+        $patients = $patients->where(function($qry){
+            return $qry->orWhereNull('mcp_pro_id')->orWhereNull('default_mcp_company_pro_id')->orWhereNull('default_mcp_company_pro_payer_id')->orWhereNull('default_mcp_company_location_id');
+        });
+
+        if ($request->input('name')) {
+            $name = trim($request->input('name'));
+            if ($name) {
+                $patients = $patients->where(function ($q) use ($name) {
+                    $q->where('name_first', 'ILIKE', '%' . $name . '%')
+                        ->orWhere('name_last', 'ILIKE', '%' . $name . '%');
+                });
+            }
+        }
+
+        if ($request->input('mcp')) {
+            if($request->input('mcp') == 'NO_MCP'){
+                $patients = $patients->whereNull('mcp_pro_id');
+            }else{
+                $mcp = Pro::where('uid', trim($request->input('mcp')))->first();
+                if ($mcp) {
+                    $patients = $patients->where('mcp_pro_id', $mcp->id);
+                }
+            }
+        }
+
+        if ($request->input('chart_number')) {
+            $patients = $patients->where('chart_number', 'ILIKE' , '%'.$request->input('chart_number').'%');
+        }
+
+        $status = $request->input('status');
+        if($status){
+            if($status == 'ACTIVE'){
+                $patients->where('is_active', true)->where(function($q) use ($status){
+                    return $q->where('client_engagement_status_category', $status)
+                    ->orWhereNull('client_engagement_status_category');
+                });    
+            }else {
+                $patients->where('client_engagement_status_category', $status);
+            }
+
+        }
+
+        $insurance = $request->get('insurance');
+        if($insurance){
+            if($insurance === 'MEDICARE'){
+                $patients = $patients->whereHas('latestClientPrimaryCoverage', function($cpcQuery){
+                    return $cpcQuery->where('is_partbprimary', '=', 'YES');
+                });
+            }else{
+                $patients = $patients->whereDoesntHave('latestClientPrimaryCoverage', function($cpcQuery){
+                    return $cpcQuery->where('is_partbprimary', '=', 'YES');
+                });
+            }
+        }
+        
+        $missing_default_settings = $request->get('missing_default_settings');
+        if($missing_default_settings){
+            if($missing_default_settings === 'NO_MCP') $patients = $patients->whereNull('mcp_pro_id');
+            if($missing_default_settings === 'NO_MCP_COMPANY_PRO') $patients = $patients->whereNull('default_mcp_company_pro_id');
+            if($missing_default_settings === 'NO_MCP_COMPANY_PRO_PAYER') $patients = $patients->whereNull('default_mcp_company_pro_payer_id');
+            if($missing_default_settings === 'NO_MCP_COMPANY_LOCATION') $patients = $patients->whereNull('default_mcp_company_location_id');
+        }
+
+        $patients = $patients->orderBy('created_at', 'DESC')->paginate(50);
+        return view('app.admin.patients_missing_default_settings', compact('patients', 'filters'));
+    }
+
 } 

app/Models/ClientStickyNote.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class ClientStickyNote extends Model
+{
+    protected $table = 'client_sticky_note';
+
+    public function createdBy(): HasOne
+    {
+        return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');
+    }
+
+    public function client(): HasOne
+    {
+        return $this->hasOne(Client::class, 'id', 'client_id');
+    }
+}

public/css/style.css

@@ -3438,6 +3438,18 @@ body.forced-masking #mask {
     top: 0;
     color: var(--primary-color);
 }
+#handoutSelectComponent .handout .handout-detail a.preview {
+    position: absolute;
+    left: -1px;
+    bottom: 0;
+    color: #fff;
+    text-align: center;
+    width: 102%;
+    background-color: rgba(28, 69, 135,0.8);
+    font-weight: bold;
+    padding: 5px 0;
+    text-decoration: none;
+}
 #handoutSelectComponent .handout.selected .handout-detail {
     border-color: var(--primary-color) !important;
 }
@@ -3450,7 +3462,7 @@ body.forced-masking #mask {
 .mcp-theme-1 .point-table [if-read-mode] .inline-html-container {
     cursor: pointer;
 }
-table.v-top td, 
+table.v-top td,
 table.v-top th {
     vertical-align:top;
 }
@@ -3476,4 +3488,11 @@ table.v-top th {
     border-color: #80bdff;
     outline: 0;
     box-shadow: 0 0 0 0.2rem rgb(0 123 255 / 25%);
-}
+}
+.coverage-payer-name {
+    width: 120px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: inline-block;
+}

resources/views/app/admin/patients_missing_default_settings.blade.php

@@ -0,0 +1,64 @@
+@extends ('layouts/template')
+
+@section('content')
+<div class="p-3 mcp-theme-1" id="patients-list">
+	<div class="card border-bottom-0">
+
+		<div class="card-header px-3 py-2 d-flex align-items-center">
+			<strong class="mr-4">
+				<i class="fas fa-users"></i>
+				PatientsMissing Default Settings
+			</strong>
+		</div>
+		<div class="p-3">
+			@include('app.admin.patients_missing_defsult_settings_filters')
+		</div>
+		<table class="table table-striped p-0 m-0 table-sm border-top border-bottom ">
+			<thead class="bg-light">
+				<tr>
+					<th class="border-0">Chart #</th>
+					<th class="border-0">Patient</th>
+					<th class="border-0">MCP</th>
+					<th class="border-0">Default MCP Company Pro</th>
+					<th class="border-0">Default MCP Company Pro Payer</th>
+					<th class="border-0">Default MCP Company Location</th>
+
+				</tr>
+			</thead>
+			<tbody>
+				@foreach($patients as $patient)
+				<tr>
+					<td>
+						<a href="{{route('patients.view.settings', $patient)}}">
+							{{$patient->chart_number}}
+						</a>
+					</td>
+					<td>
+						<a href="{{route('patients.view.settings', $patient)}}">
+							{{$patient->displayName()}}
+						</a>
+					</td>
+					<td>{{ $patient->mcp ? $patient->mcp->displayName() : 'NO' }}</td>
+					<td>{{ $patient->defaultMcpCompanyPro ? $patient->defaultMcpCompanyPro->company->name : 'NO' }}</td>
+					<td>{{ $patient->defaultMcpCompanyProPayer ? $patient->defaultMcpCompanyProPayer->payer->name : 'NO' }}</td>
+					<td>{{$patient->default_mcp_company_location_id? implode(" ", [$patient->defaultMcpCompanyLocation->line1, $patient->defaultMcpCompanyLocation->city, $patient->defaultMcpCompanyLocation->state]):'NO'}}</td>
+				</tr>
+				@endforeach
+
+				@if(count($patients) === 0)
+				<tr>
+					<td colspan="6">No records found!</td>
+				</tr>
+				@endif
+			</tbody>
+
+		</table>
+	</div>
+	<div class="p-3">
+		{{$patients->withQueryString()->links()}}
+	</div>
+
+</div>
+</div>
+</div>
+@endsection

resources/views/app/admin/patients_missing_defsult_settings_filters.blade.php

@@ -0,0 +1,145 @@
+<style>
+	#admin-patients-filters label {
+		font-weight: bold;
+	}
+
+	#admin-patients-filters .mw-100px {
+		min-width: 100px;
+	}
+	.filter-container{
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 165px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 10px;
+	}
+	.sm-section {
+		width: 150px !important;
+	}
+</style>
+<form id="admin-patients-filters" method="GET" action="{{ route('admin.patientsMissingDefasultSettings') }}" class="filter-container" v-cloak>
+	<div class="sm-section">
+		<div class="">
+			<label>Name:</label>
+			<input name="name" class="form-control input-sm" v-model="filters.name">
+		</div>
+	</div>
+
+	<div class="sm-section">
+		<div class="mcp-filter-container">
+			<label>MCP:</label>
+		</div>
+	</div>
+
+	<!-- STATUS -->
+	<div class="sm-section">
+		<div class="">
+			<label>Status:</label>
+			<select name="status" class="form-control input-sm" v-model="filters.status">
+				<option value="">All</option>
+ 				<option value="ACTIVE">Active</option>
+ 				<option value="DUMMY">Test Record</option>
+ 				<option value="NO_LONGER_INTERESTED">No Longer Interested</option>
+ 				<option value="INACTIVE">Inactive</option>
+ 				<option value="ENTRY_ERROR">Entry Error</option>
+ 				<option value="DUPLICATE">Duplicate</option>
+ 				<option value="DECEASED">Deceased</option>
+ 				<option value="BAD_RECORD">Bad Record</option>
+			</select>
+		</div>
+	</div>
+
+	<div class="sm-section">
+		<div class="">
+			<label>Insurance:</label>
+			<select class="form-control"  name="insurance" v-model="filters.insurance">
+				<option value=""></option>
+				<option value="MEDICARE">Medicare (Part B)</option>
+				<option value="OTHER">Other</option>
+			</select>
+		</div>
+	</div>
+
+	<div class="sm-section">
+		<div class="">
+			<label>Chart #</label>
+			<input class="form-control"  name="chart_number" v-model="filters.chart_number">
+		</div>
+	</div>
+
+	<div class="sm-section" style="width: 185px !important;">
+		<div class="">
+			<label>Missing Default Setting(s):</label>
+			<select class="form-control"  name="missing_default_settings" v-model="filters.missing_default_settings">
+				<option value="">Any</option>
+				<option value="NO_MCP">No MCP</option>
+				<option value="NO_MCP_COMPANY_PRO">No MCP Company Pro</option>
+				<option value="NO_MCP_COMPANY_PRO_PAYER">No MCP Company Pro Payer</option>
+				<option value="NO_MCP_COMPANY_LOCATION">No MCP Company Location</option>
+			</select>
+		</div>
+	</div>
+	
+	<div>
+		<div class="">
+			<label>&nbsp;</label>
+			<div class=" d-flex">
+				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('admin.patientsMissingDefasultSettings')}}')" class="btn btn-link btn-sm text-danger">Clear</a>
+			</div>
+		</div>
+	</div>
+</form>
+
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'name',	
+	'status',
+	'insurance',
+	'chart_number',
+	'missing_default_settings'
+];
+for ($i=0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+<script>
+	(function() {
+		function init() {
+			new Vue({
+				el: '#admin-patients-filters',
+				delimiters: ['@{{', '}}'],
+				data: {
+					filters: <?= json_encode($loadedFilters) ?>
+				},
+				methods: {
+					init: function() {
+
+					},
+					doSubmit: function() {
+						fastLoad("{{ route('admin.patientsMissingDefasultSettings') }}?" + $('#admin-patients-filters').serialize());
+						return false;
+					}
+				},
+				mounted: function() {
+					console.log(this.filters);
+					this.init();
+
+					let mcpSelect = $('<select name="mcp" class="form-control min-width-unset input-sm" provider-search data-pro-uid="{{request()->input("mcp")}}" provider-type="hcp"><option value="">--select--</option></select>').appendTo('.mcp-filter-container');
+					let naSelect = $('<select name="na" class="form-control min-width-unset input-sm" provider-search data-pro-uid="{{request()->input("na")}}" provider-type="non-hcp"><option value="">--select--</option></select>').appendTo('.na-filter-container');
+					initProSuggest();
+				},
+			});
+
+
+		}
+		addMCInitializer('admin-patients-filters', init, '#admin-patients-filters');
+	})();
+</script>

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

@@ -0,0 +1,80 @@
+<div moe>
+	<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 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>
+				<option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+				<option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+				<option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+			</select>
+		</div>
+		<div class="mb-2">
+			<input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" max="{{ date('Y-m-d') }}">
+		</div>
+		<div class="mb-2">
+			<select name="mcpOnboardingVisitNoteUid" disabled class="form-control form-control-sm if-visit-done" onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
+				<option value="">-- Visit Note --</option>
+				<?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
+				@foreach ($notes as $note)
+				@if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
+				<option value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
+				@endif
+				@endforeach
+			</select>
+		</div>
+		<div class="mb-2 if-note-outside-system">
+			<textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason"></textarea>
+		</div>
+		</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>
+
+
+<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);
+					});
+					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();
+			});
+		}
+	});
+</script>

resources/views/app/patient/care-month/dashboard.blade.php

@@ -46,47 +46,7 @@
                             <i class="fa fa-exclamation-triangle"></i>
                             MCP Onboarding Visit Pending
                         </span>
-                        <div moe>
-                            <a start show>Update</a>
-                            <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <select name="hasMcpDoneOnboardingVisit"
-                                            class="form-control form-control-sm"
-                                            onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
-                                        <option value="">-- Select Status --</option>
-                                        <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
-                                        <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
-                                        <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2">
-                                    <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" max="{{ date('Y-m-d') }}">
-                                </div>
-                                <div class="mb-2">
-                                    <select name="mcpOnboardingVisitNoteUid" disabled
-                                            class="form-control form-control-sm if-visit-done"
-                                            onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
-                                        <option value="">-- Visit Note --</option>
-                                        <?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
-                                        @foreach ($notes as $note)
-                                            @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
-                                                <option value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
-                                            @endif
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="mb-2 if-note-outside-system">
-                                    <textarea class="form-control form-control-sm"
-                                              name="reasonOnboardingVisitNoteOutsideSystem"
-                                              placeholder="Visit note outside the system reason"></textarea>
-                                </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>
+                        @include('app.patient.care-month.care-month-update-mcp-onboarding-visit-info')
                     </div>
                 </div>
             </h6>

resources/views/app/patient/care-month/put-rm-reasons.blade.php

@@ -1,59 +0,0 @@
-<div moe relative>
-	<a start show><i class="fas fa-edit"></i></a>
-	<form url="/api/careMonth/putRmReasons" class="mcp-theme-1" right>
-		<input type="hidden" name="uid" value="{{$careMonth->uid}}">
-		<div>
-			<table class="table table-sm table-bordered">
-				<thead class="bg-light">
-					<tr>
-						<th class="border-bottom-0">ICD</th>
-						<th class="border-bottom-0">Description</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $careMonth->rm_reason_icd1 }}" placeholder="ICD 1" />
-						</td>
-						<td>
-							<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $careMonth->rm_reason_icd1description }}">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $careMonth->rm_reason_icd2 }}" placeholder="ICD 2" />
-						</td>
-						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $careMonth->rm_reason_icd2description }}">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $careMonth->rm_reason_icd3 }}" placeholder="ICD 3" />
-						</td>
-						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $careMonth->rm_reason_icd3description }}" >
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $careMonth->rm_reason_icd4 }}" placeholder="ICD 4"/>
-						</td>
-						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $careMonth->rm_reason_icd4description }}">
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-
-		<div class="mb-3">
-			<label class="font-weight-bold">RM Reason Memo</label>
-			<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $careMonth->rm_reason_memo }}">
-		</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>

resources/views/app/patient/care-month/rm-reasons.blade.php

@@ -1,50 +1,7 @@
 <div class="d-flex align-items-center mb-1">
     <span class="mr-2">RM Reasons:</span>
-    @include('app.patient.care-month.put-rm-reasons')
+    @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CARE_MONTH', 'record' => $careMonth])
 </div>
-<div class="">
-    <table class="table table-sm table-striped table-bordered">
-        <tbody>
-            <tr>
-                <td class="text-nowrap">ICD 1</td>
-                <td>
-                    <div class="d-flex">
-                        <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd1 ? $careMonth->rm_reason_icd1 . ':' : '' }}</span>
-                        <small class="text-muted text-sm">{{ $careMonth->rm_reason_icd1description }}</small>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="text-nowrap">ICD 2</td>
-                <td>
-                    <div class="d-flex">
-                        <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd2 ? $careMonth->rm_reason_icd2 . ':' :'' }}</span>
-                        <small class="text-muted text-sm">{{ $careMonth->rm_reason_icd2description }}</small>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="text-nowrap">ICD 3</td>
-                <td>
-                    <div class="d-flex">
-                        <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd3 ? $careMonth->rm_reason_icd3 . ':' : '' }}</span>
-                        <small class="text-muted text-sm">{{ $careMonth->rm_reason_icd3description }}</small>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="text-nowrap">ICD 4</td>
-                <td>
-                    <div class="d-flex">
-                        <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd4 ? $careMonth->rm_reason_icd4 . ':' : '' }}</span>
-                        <small class="text-muted text-sm">{{ $careMonth->rm_reason_icd4description }}</small>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="text-nowrap">Memo</td>
-                <td class="text-muted text-sm">{{ $careMonth->rm_reason_memo }}</td>
-            </tr>
-        </tbody>
-    </table>
+<div class="pl-3">
+    @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CARE_MONTH', 'record' => $careMonth])
 </div>

resources/views/app/patient/coverage-status.blade.php

@@ -112,7 +112,7 @@
         <tr>
           <td class="font-weight-bold">Medicaid<br>(Primary):</td>
           <td>
-            <span><b>{{$coverage->mcdPayer->name ?? '-'}}</b></span> <br>
+            <span class="coverage-payer-name" title="{{$coverage->mcdPayer->name ?? '-'}}"><b>{{$coverage->mcdPayer->name ?? '-'}}</b></span> <br>
             <span><i class="fas fa-hourglass-half text-warning"></i> Pending Validation</span> <br>
           </td>
         </tr>
@@ -132,7 +132,7 @@
           <tr>
             <td class="font-weight-bold">Medicaid<br>(Primary):</td>
             <td>
-              <span><b>{{$coverage->mcd_payer_name ?? '-'}}</b></span> <br>
+              <span class="coverage-payer-name" title="{{$coverage->mcd_payer_name ?? '-'}}"><b>{{$coverage->mcd_payer_name ?? '-'}}</b></span> <br>
               @if($coverage->manual_determination_category == 'COVERED')
               <span><i class="fas fa-check-circle text-success"></i></span>
               @elseif($coverage->manual_determination_category == 'NOT_COVERED')
@@ -160,7 +160,7 @@
         <tr>
           <td class="font-weight-bold">Commercial<br>(Primary):</td>
           <td>
-            <span><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
+            <span class="coverage-payer-name" title="{{$coverage->payer->name ?? '-'}}"><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
             <span><i class="fas fa-hourglass-half text-warning"></i> Pending Validation</span> <br>
           </td>
         </tr>
@@ -180,7 +180,7 @@
           <tr>
             <td class="font-weight-bold">Commercial<br>(Primary):</td>
             <td>
-              <span><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
+              <span class="coverage-payer-name" title="{{$coverage->payer->name ?? '-'}}"><b>{{$coverage->payer->name ?? '-'}}</b></span> <br>
               @if($coverage->manual_determination_category == 'COVERED')
               <span><i class="fas fa-check-circle text-success"></i></span>
               @elseif($coverage->manual_determination_category == 'NOT_COVERED')

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

@@ -1,13 +1,17 @@
 <div class="d-flex align-items-center">
     <?php 
         $coverage = $patient->getPrimaryCoverage();
-        $coverageStatus = $patient->getPrimaryCoverageStatus(); 
+        $coverageStatus = $patient->getPrimaryCoverageStatus();
     ?>
     
     @if($coverageStatus === 'YES')
         <i class="fa fa-check-circle text-success"></i>
     @elseif($coverageStatus === 'NO')
-        <i class="fa fa-times text-danger"></i>
+        @if($coverage && !$coverage->manual_determination_category)
+            <i class="fas fa-hourglass-half text-warning" title="Pending Validation"></i>
+        @else
+            <i class="fa fa-times text-danger"></i>
+        @endif
     @else
         @if($coverage && $coverage->plan_type == 'MEDICARE' && !$coverage->auto_medicare_is_match_found)
             <i class="fa fa-times text-danger"></i>
@@ -21,8 +25,14 @@
     @endif
     
     @if($coverage)
-        <span class="ml-2">{{$coverage->insuranceDisplayName()}}</span>
+        @if($coverage->plan_type === 'MEDICAID' && $coverage->mcdPayer)
+            <span class="ml-2">{{$coverage->mcdPayer->name}}</span>
+        @elseif($coverage->plan_type === 'COMMERCIAL' && $coverage->payer)
+            <span class="ml-2">{{$coverage->payer->name}}</span>
+        @else
+            <span class="ml-2">{{$coverage->insuranceDisplayName()}}</span>
+        @endif
     @else
-    <small class="ml-2 text-muted">(No insurance)</small>
+        <small class="ml-2 text-muted">(No insurance)</small>
     @endif
 </div>

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

@@ -3,8 +3,8 @@
 
 <style>
     .select2-container {
-    width: 100% !important;
-}
+        width: 100% !important;
+    }
 </style>
 
 <div class="">
@@ -16,20 +16,26 @@
             <form url="/api/handoutClient/create" style="width: 500px;">
                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                 @if(@$note)
-                    <input type="hidden" name="noteUid" value="{{ $note->uid }}">
+                <input type="hidden" name="noteUid" value="{{ $note->uid }}">
                 @endif
                 <div id="handoutSelectComponent" class="mb-2" v-cloak>
                     <input type="hidden" name="handoutUid" :value="selectedHandoutUid" />
                     <input type="search" class="form-control" placeholder="Search Handout" @keyup="filterHandouts" />
-                    <div class="row mt-3">
-                        <div v-for="handout in handoutsList" class="col-md-4 mb-2 handout" :class="selectedHandoutUid == handout.uid ? 'selected':''" @click="selectedHandoutUid = handout.uid">
-                            <div class="d-flex flex-column h-100 border rounded p-2 handout-detail">
-                            <i v-if="selectedHandoutUid == handout.uid" class="fas fa-check-circle"></i>
-                                <img :src="'/api/handout/download-thumbnail/'+handout.uid" :alt="handout.display_name"  onerror="if (this.src != '/img/pdf.png') this.src = '/img/pdf.png';">
-                                <h6 class="mt-2 mb-0 text-center">@{{ handout.display_name }}</h6>
+                    <div class="mt-3" style="max-height: 430px;overflow-y: auto;overflow-x:hidden;">
+                        <div class="row">
+                            <div v-for="handout in handoutsList" class="col-md-4 mb-2 handout" :class="selectedHandoutUid == handout.uid ? 'selected':''" @click="selectedHandoutUid = handout.uid">
+                                <div class="d-flex flex-column h-100 border rounded p-2 handout-detail">
+                                    <i v-if="selectedHandoutUid == handout.uid" class="fas fa-check-circle"></i>
+                                    <img :src="'/api/handout/download-thumbnail/'+handout.uid" :alt="handout.display_name" onerror="if (this.src != '/img/pdf.png') this.src = '/img/pdf.png';">
+                                    <h6 class="mt-2 mb-0 text-center">@{{ handout.display_name }}</h6>
+
+                                    <a class="c-pointer preview pdf-viewer-trigger" native target="_blank" :href="'/api/handout/download/'+handout.uid" title="View">Preview PDF</a>
+
+                                </div>
                             </div>
                         </div>
                     </div>
+
                 </div>
                 <div class="d-flex align-items-center">
                     <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -40,28 +46,26 @@
     </div>
     <table class="table table-striped table-sm table-bordered m-0">
         <thead class="bg-light">
-        <tr>
-            <th></th>
-            <th class="border-0 text-secondary">Internal Name</th>
-            <th class="border-0 text-secondary">Display Name</th>
-            <th class="border-0 text-secondary">View</th>
-            <th class="border-0 text-secondary w-50">Shareable Link</th>
-            <th class="border-0 text-secondary"></th>
-        </tr>
+            <tr>
+                <th></th>
+                <th class="border-0 text-secondary">Internal Name</th>
+                <th class="border-0 text-secondary">Display Name</th>
+                <th class="border-0 text-secondary">View</th>
+                <th class="border-0 text-secondary w-50">Shareable Link</th>
+                <th class="border-0 text-secondary"></th>
+            </tr>
         </thead>
         <tbody>
-        @foreach($clientHandouts as $clientHandout)
-            <?php $downloadLink = config('app.url') . "/guest/handout/".$clientHandout->uid; ?>
+            @foreach($clientHandouts as $clientHandout)
+            <?php $downloadLink = config('app.url') . "/guest/handout/" . $clientHandout->uid; ?>
             <tr>
                 <td>
-                    <img width="50" src="/api/handout/download-thumbnail/{{ $clientHandout->handout->uid }}" alt="{{$clientHandout->handout->display_name}}"  onerror="if (this.src != '/img/pdf.png') this.src = '/img/pdf.png';">
+                    <img width="50" src="/api/handout/download-thumbnail/{{ $clientHandout->handout->uid }}" alt="{{$clientHandout->handout->display_name}}" onerror="if (this.src != '/img/pdf.png') this.src = '/img/pdf.png';">
                 </td>
                 <td>{{$clientHandout->handout->internal_name}}</td>
                 <td>{{$clientHandout->handout->display_name}}</td>
                 <td>
-                    <a class="pdf-viewer-trigger" native target="_blank"
-                               href="/api/handout/download/{{ $clientHandout->handout->uid }}"
-                               title="View">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>
@@ -87,49 +91,57 @@
                     </div>
                 </td>
             </tr>
-        @endforeach
+            @endforeach
         </tbody>
     </table>
 </div>
 <script>
-        var handoutSelectComponent = new Vue({
-            el:'#handoutSelectComponent',
-            data:{
-                handouts:<?= json_encode($handouts) ?>,
-                handoutsList: [],
-                selectedHandoutUid: null,
-                search: null
+    var handoutSelectComponent = new Vue({
+        el: '#handoutSelectComponent',
+        data: {
+            handouts: <?= json_encode($handouts) ?>,
+            handoutsList: [],
+            selectedHandoutUid: null,
+            search: null,
+            preview: null,
+        },
+        methods: {
+            togglePreview: function(handoutUid) {
+                this.preview = handoutUid;
+                if (!handoutUid) {
+                    
+                }                
             },
-            methods:{
-                filterHandouts: function(evt){
-                    var self = this;
-                    self.search = evt.target.value;
+            filterHandouts: function(evt) {
+                var self = this;
+                self.search = evt.target.value;
 
-                    var obj = $.extend({}, {handouts:self.handouts});
-                    var handoutsList = obj.handouts;
-                    
-                    if(!self.search.length){
-                        self.handoutsList = handoutsList;
-                        return;
-                    }
+                var obj = $.extend({}, {
+                    handouts: self.handouts
+                });
+                var handoutsList = obj.handouts;
 
-                    var data = [];
-                    for(var i = 0; i < handoutsList.length; i++){
-                        var handout = handoutsList[i];
-                        if( handout.display_name.toLowerCase().includes(self.search.toLowerCase())){
-                            data.push(handout);
-                        }
-                    }
-                    self.handoutsList = data;
+                if (!self.search.length) {
+                    self.handoutsList = handoutsList;
+                    return;
+                }
 
-                },
-                init: function(){
-                    this.handoutsList = this.handouts;
+                var data = [];
+                for (var i = 0; i < handoutsList.length; i++) {
+                    var handout = handoutsList[i];
+                    if (handout.display_name.toLowerCase().includes(self.search.toLowerCase())) {
+                        data.push(handout);
+                    }
                 }
+                self.handoutsList = data;
+
             },
-            mounted: function(){
-                this.init();
+            init: function() {
+                this.handoutsList = this.handouts;
             }
-        });
-        
+        },
+        mounted: function() {
+            this.init();
+        }
+    });
 </script>

resources/views/app/patient/note/dashboard-bu-b4-pure-soap.blade.php

@@ -1031,20 +1031,56 @@
                     <div class="">
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
-                            @include('app/patient/note/_create-note-reason')
+                            @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-flex align-items-start flex-wrap">
-                        @if(count($note->reasons))
-                             @foreach ($note->reasons as $reason)
-                                <span class="badge badge-info p-2 mb-2 mr-2">
-                                    {{ $reason->description}} ({{ $reason->code }})
-                                </span>
-                            @endforeach
-                        @else
-                            <div class="alert alert-info position-static">No note reasons</div>
-                        @endif
+                            <?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>
+                    @if(!empty($note->note_reason_memo))
+                        <div style="padding-left: 60px;">
+                            <small><b>Reason:</b> {{ $note->note_reason_memo }}</small>
+                        </div>
+                    @endif
                 </div>
 
                 @if($pro->pro_type === 'ADMIN')

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

@@ -864,20 +864,56 @@
                             <div class="">
                                 <div class="d-flex align-items-center mb-2">
                                     <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
-                                    @include('app/patient/note/_create-note-reason')
+                                    @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-flex align-items-start flex-wrap">
-                                    @if(count($note->reasons))
-                                        @foreach ($note->reasons as $reason)
-                                            <span class="badge badge-info p-2 mb-2 mr-2">
-                                    {{ $reason->description}} ({{ $reason->code }})
-                                </span>
+                                    <?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
-                                    @else
-                                        <div class="alert alert-info">No note reasons</div>
+                                    @if($emptyNoteICDs)
+                                        <small class="text-dark">-</small>
                                     @endif
                                 </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($pro->pro_type === 'ADMIN')
                             <div class="p-3 border-bottom screen-only">

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

@@ -567,7 +567,7 @@ use App\Models\Handout;
                                 @if($pro->pro_type === 'ADMIN')
                                     <div class="ml-3">
                                         <div moe>
-                                            <a class="" href="" show start>Undo Sign As Hcp</a>
+                                            <a class="" href="" show start>Undo Sign As HCP</a>
                                             <form url="/api/note/adminUndoSignAsHcp" right>
                                                 <input type="hidden" name="uid" value="{{$note->uid}}">
                                                 <p>Undo HCP signature?</p>
@@ -1078,24 +1078,60 @@ use App\Models\Handout;
                     </script>
                 </div>
 
-                <div class="p-2 border-bottom" data-non-segment-section="ICDs">
+                <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 {{ count($note->reasons) > 2 ? '':'align-items-center' }} mr-2">
+                        <div class="d-flex mr-2">
                             <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
-                            @include('app/patient/note/_create-note-reason')
+                            @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-flex align-items-start flex-wrap">
-                        @if(count($note->reasons))
-                             @foreach ($note->reasons as $reason)
-                                <span class="badge badge-info p-2 mb-1 mr-2">
-                                    {{ $reason->description}} ({{ $reason->code }})
-                                </span>
-                            @endforeach
-                        @else
-                            <div class="alert alert-info position-static">No note reasons</div>
-                        @endif
-                        </div>
+                            <?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>
+                    @if(!empty($note->note_reason_memo))
+                        <div style="padding-left: 60px;">
+                            <small><b>Reason:</b> {{ $note->note_reason_memo }}</small>
+                        </div>
+                    @endif
                 </div>
 
                 @if($pro->pro_type === 'ADMIN')

resources/views/app/patient/note/rm-setup.blade.php

@@ -122,16 +122,15 @@
             </div> 
         @endif
         
-
         <div class="d-flex align-items-baseline mb-3">
             <div class="flex-grow-1">
                 <div>
                     <div class="d-flex align-items-center mb-1">
                         <span class="mr-2">RM Reasons:</span>
-                        @include('app.patient.partials.put-rm-reasons')
+                        @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])
                     </div>
                     <div class="">
-                        @include('app.patient.partials.rm-reasons-display')
+                        @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CLIENT', 'record' => $patient])
                     </div>
                 </div>
                 {{--<div>

resources/views/app/patient/note/rpm-agreement.blade.php

@@ -43,53 +43,62 @@
     <?php $patient = $note->client; ?>
 
     <div class="border rounded p-3 mb-3 max-width-500px" id="rpm-agreement-reasons-{{$note->id}}">
-        <p><b>RPM Reasons</b></p>
+        <div class="d-flex align-items-center mb-2">
+            <p class="mb-0 mr-2"><b>RM Reasons</b></p>
+            <div>@include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])</div>
+        </div>
         <div class="max-width-500px">
-            @if(!$patient->rmReasons || !count($patient->rmReasons))
-                <span class="text-secondary d-block mb-2">None</span>
-            @else
-                <div>
-                    @foreach($patient->rmReasons as $reason)
-                        <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                            <b class="min-width-70px">{{$reason->code}}</b>
-                            <span class="max-width-200px mr-3">{{$reason->description}}</span>
-                            <div moe relative class="ml-auto">
-                                <a start show><i class="fa fa-edit"></i></a>
-                                <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target="#rpm-agreement-reasons-{{$note->id}}">
-                                    <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                    <div class="mb-2">
-                                        <label class="text-sm mb-1 text-secondary">Code *</label>
-                                        <input type="text" class="form-control form-control-sm"
-                                               icd-autocomplete-code
-                                               name="code" value="{{$reason->code}}" required>
-                                    </div>
-                                    <div class="mb-2">
-                                        <label class="text-sm mb-1 text-secondary">Description</label>
-                                        <input type="text" class="form-control form-control-sm"
-                                               icd-autocomplete-description
-                                               name="description" value="{{$reason->description}}">
-                                    </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>
-                            <div moe relative class="ml-2">
-                                <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target="#rpm-agreement-reasons-{{$note->id}}">
-                                    <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                    <p>Remove this RM reason?</p>
-                                    <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>
+                @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CLIENT', 'record' => $patient])
+            </div>
+            {{--<div>
+                @if(!$patient->rmReasons || !count($patient->rmReasons))
+                    <span class="text-secondary d-block mb-2">None</span>
+                @else
+                    <div>
+                        @foreach($patient->rmReasons as $reason)
+                            <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
+                                <b class="min-width-70px">{{$reason->code}}</b>
+                                <span class="max-width-200px mr-3">{{$reason->description}}</span>
+                                <div moe relative class="ml-auto">
+                                    <a start show><i class="fa fa-edit"></i></a>
+                                    <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target="#rpm-agreement-reasons-{{$note->id}}">
+                                        <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                        <div class="mb-2">
+                                            <label class="text-sm mb-1 text-secondary">Code *</label>
+                                            <input type="text" class="form-control form-control-sm"
+                                                icd-autocomplete-code
+                                                name="code" value="{{$reason->code}}" required>
+                                        </div>
+                                        <div class="mb-2">
+                                            <label class="text-sm mb-1 text-secondary">Description</label>
+                                            <input type="text" class="form-control form-control-sm"
+                                                icd-autocomplete-description
+                                                name="description" value="{{$reason->description}}">
+                                        </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>
+                                <div moe relative class="ml-2">
+                                    <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                                    <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target="#rpm-agreement-reasons-{{$note->id}}">
+                                        <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                        <p>Remove this RM reason?</p>
+                                        <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>
                             </div>
-                        </div>
-                    @endforeach
-                </div>
-            @endif
+                        @endforeach
+                    </div>
+                @endif
+            </div>--}}
+            {{--
             <div class="d-flex align-items-baseline">
                 <div moe>
                     <a start show>+ Add From Dx</a>
@@ -141,6 +150,7 @@
                     </form>
                 </div>
             </div>
+            --}}
         </div>
     </div>
 

resources/views/app/patient/partials/put-rm-reasons.blade.php

@@ -1,7 +1,46 @@
+<?php
+$rmDisplayData = [
+	'icd_1' => [
+		'title' => 'ICD 1',
+		'reason' => $record->rm_reason_icd1,
+		'description' => $record->rm_reason_icd1description
+	],
+	'icd_2' => [
+		'title' => 'ICD 2',
+		'reason' => $record->rm_reason_icd2,
+		'description' => $record->rm_reason_icd2description
+	],
+	'icd_3' => [
+		'title' => 'ICD 3',
+		'reason' => $record->rm_reason_icd3,
+		'description' => $record->rm_reason_icd3description
+	],
+	'icd_4' => [
+		'title' => 'ICD 4',
+		'reason' => $record->rm_reason_icd4,
+		'description' => $record->rm_reason_icd4description
+	],
+];
+if($recordType === 'NOTE'){
+	$rmDisplayData['icd_1']['reason'] = $record->note_reason_icd1;
+	$rmDisplayData['icd_1']['description'] = $record->note_reason_icd1description;
+	$rmDisplayData['icd_2']['reason'] = $record->note_reason_icd2;
+	$rmDisplayData['icd_2']['description'] = $record->note_reason_icd2description;
+	$rmDisplayData['icd_3']['reason'] = $record->note_reason_icd3;
+	$rmDisplayData['icd_3']['description'] = $record->note_reason_icd3description;
+	$rmDisplayData['icd_4']['reason'] = $record->note_reason_icd4;
+	$rmDisplayData['icd_4']['description'] = $record->note_reason_icd4description;
+}
+
+	$submitUrl = null;
+	if(@$recordType === 'CLIENT') $submitUrl = '/api/client/putRmReasons';
+	if(@$recordType === 'NOTE') $submitUrl = '/api/note/putReasons';
+	if(@$recordType === 'CARE_MONTH') $submitUrl = '/api/careMonth/putRmReasons';
+?>
 <div moe>
 	<a start show><i class="fas fa-edit on-hover-opaque"></i></a>
-	<form url="/api/client/putRmReasons" class="mcp-theme-1">
-		<input type="hidden" name="uid" value="{{$patient->uid}}">
+	<form url="{{ $submitUrl }}" class="mcp-theme-1">
+		<input type="hidden" name="uid" value="{{$record->uid}}">
 		<div>
 			<table class="table table-sm table-bordered">
 				<thead class="bg-light">
@@ -13,42 +52,42 @@
 				<tbody>
 					<tr>
 						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $patient->rm_reason_icd1 }}" placeholder="ICD 1" />
+							<input type="text" class="icd-input" icd-autocomplete-code data-target="input[name=reasonIcd1Description]" name="reasonIcd1" value="{{ $rmDisplayData['icd_1']['reason'] }}" placeholder="ICD 1" />
 						</td>
 						<td>
-							<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $patient->rm_reason_icd1description }}">
+							<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="reasonIcd1Description" value="{{ $rmDisplayData['icd_1']['description'] }}">
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $patient->rm_reason_icd2 }}" placeholder="ICD 2" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="reasonIcd2" data-target="input[name=reasonIcd2Description]" value="{{ $rmDisplayData['icd_2']['reason'] }}" placeholder="ICD 2" />
 						</td>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $patient->rm_reason_icd2description }}">
+							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="reasonIcd2Description" value="{{ $rmDisplayData['icd_2']['description'] }}">
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $patient->rm_reason_icd3 }}" placeholder="ICD 3" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="reasonIcd3" data-target="input[name=reasonIcd3Description]" value="{{ $rmDisplayData['icd_3']['reason'] }}" placeholder="ICD 3" />
 						</td>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $patient->rm_reason_icd3description }}">
+							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="reasonIcd3Description" value="{{ $rmDisplayData['icd_3']['description'] }}">
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $patient->rm_reason_icd4 }}" placeholder="ICD 4" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="reasonIcd4" data-target="input[name=reasonIcd4Description]" value="{{ $rmDisplayData['icd_4']['reason'] }}" placeholder="ICD 4" />
 						</td>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $patient->rm_reason_icd4description }}">
+							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="reasonIcd4Description" value="{{ $rmDisplayData['icd_4']['description'] }}">
 						</td>
 					</tr>
 				</tbody>
 			</table>
 		</div>
 		<div class="mb-2">
-			<label class="font-weight-bold mb-1">RM Reason Memo:</label>
-			<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $patient->rm_reason_memo }}">
+			<label class="font-weight-bold mb-1">{{ $recordType !== 'NOTE' ? 'RM' : '' }} Reason Memo:</label>
+			<input type="text" class="form-control form-control-sm" name="reasonMemo" value="{{ $recordType === 'NOTE' ? $record->note_reason_memo : $record->rm_reason_memo }}">
 		</div>
 		<div>
 			<button submit class="btn btn-sm btn-primary mr-1">Submit</button>

resources/views/app/patient/partials/rm-reasons-display.blade.php

@@ -1,44 +1,48 @@
-<table class="table table-sm table-striped table-bordered mb-0">
-	<tbody>
-		<tr>
-			<td class="text-nowrap">ICD 1</td>
-			<td>
-				<div class="d-flex">
-					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd1 ? $patient->rm_reason_icd1. ':':'' }}</span>
-					<small class="text-muted text-sm">{{ $patient->rm_reason_icd1description }}</small>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="text-nowrap">ICD 2</td>
-			<td>
-				<div class="d-flex">
-					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd2 ? $patient->rm_reason_icd2 . ':':'' }}</span>
-					<small class="text-muted text-sm">{{ $patient->rm_reason_icd2description }}</small>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="text-nowrap">ICD 3</td>
-			<td>
-				<div class="d-flex">
-					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd3 ? $patient->rm_reason_icd3 . ':':'' }}</span>
-					<small class="text-muted text-sm">{{ $patient->rm_reason_icd3description }}</small>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="text-nowrap">ICD 4</td>
-			<td>
-				<div class="d-flex">
-					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd4 ? $patient->rm_reason_icd4. ':' : '' }}</span>
-					<small class="text-muted text-sm">{{ $patient->rm_reason_icd4description }}</small>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td class="text-nowrap">Memo</td>
-			<td class="text-muted text-sm">{{ $patient->rm_reason_memo }}</td>
-		</tr>
-	</tbody>
-</table>
+<?php
+$displayData = [
+	'icd_1' => [
+		'title' => 'ICD 1',
+		'reason' => $record->rm_reason_icd1,
+		'description' => $record->rm_reason_icd1description
+	],
+	'icd_2' => [
+		'title' => 'ICD 2',
+		'reason' => $record->rm_reason_icd2,
+		'description' => $record->rm_reason_icd2description
+	],
+	'icd_3' => [
+		'title' => 'ICD 3',
+		'reason' => $record->rm_reason_icd3,
+		'description' => $record->rm_reason_icd3description
+	],
+	'icd_4' => [
+		'title' => 'ICD 4',
+		'reason' => $record->rm_reason_icd4,
+		'description' => $record->rm_reason_icd4description
+	],
+];
+?>
+<div>
+	<div class="d-flex flex-wrap">
+		<?php $emptyICDs = true; ?>
+		@foreach($displayData as $rmKey=>$rmData)
+			<?php
+			$emptyICD = true;
+			if (!empty($rmData['reason']) || !empty($rmData['description'])) {
+				$emptyICDs = false;
+				$emptyICD = false;
+			}
+			?>
+			@if(!$emptyICD)
+				<span class="mb-1 mr-2"><i class="fas fa-star text-warning"></i> {{$rmData['reason']}} @if(!empty($rmData['description']))({{ $rmData['description'] }})@endif</span>
+			@endif
+		@endforeach
+		@if($emptyICDs)
+		<small class="text-dark">-</small>
+		@endif
+	</div>
+	<div class="d-flex">
+			<span class="mr-2"><b>Memo:</b></span>
+			<small class="text-muted">{{ $record->rm_reason_memo }}</small>
+	</div>
+</div>

resources/views/app/patient/partials/rm-reasons-display_depricated.blade.php

@@ -0,0 +1,43 @@
+<?php
+	$displayData = [
+		'icd_1' => [
+			'title' => 'ICD 1',
+			'reason' => $record->rm_reason_icd1,
+			'description' => $record->rm_reason_icd1description
+		],
+		'icd_2' => [
+			'title' => 'ICD 2',
+			'reason' => $record->rm_reason_icd2,
+			'description' => $record->rm_reason_icd2description
+		],
+		'icd_3' => [
+			'title' => 'ICD 3',
+			'reason' => $record->rm_reason_icd3,
+			'description' => $record->rm_reason_icd3description
+		],
+		'icd_4' => [
+			'title' => 'ICD 4',
+			'reason' => $record->rm_reason_icd4,
+			'description' => $record->rm_reason_icd4description
+		],
+	];
+?>
+<table class="table table-sm table-striped table-bordered mb-0">
+	<tbody>
+		@foreach($displayData as $rmKey=>$rmData)
+		<tr>
+			<td class="text-nowrap">{{ $rmData['title'] }}</td>
+			<td>
+				<div class="d-flex">
+					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $rmData['reason'] ? $rmData['reason']. ':':'' }}</span>
+					<small class="text-muted text-sm">{{ $rmData['description'] }}</small>
+				</div>
+			</td>
+		</tr>
+		@endforeach
+		<tr>
+			<td class="text-nowrap">Memo</td>
+			<td class="text-muted text-sm">{{ $record->rm_reason_memo }}</td>
+		</tr>
+	</tbody>
+</table>

resources/views/app/patient/partials/rm-setup.blade.php

@@ -104,13 +104,17 @@
                 </div>
             </div>
         </div>
-        <div class="d-flex align-items-center mb-1">
-            <span class="mr-2">RM Reasons:</span>
-            @include('app.patient.partials.put-rm-reasons')
-        </div>
-        <div class="pl-3" style="max-width: 570px;">
-            @include('app.patient.partials.rm-reasons-display')
+
+        <div class="d-flex align-items-start flex-column mb-1">
+            <div class="mr-2 width-200px">
+                <span class="mr-2">RM Reasons:</span>
+                @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CLIENT', 'record' => $patient])
+            </div>
+            <div class="pl-3">
+                @include('app.patient.partials.rm-reasons-display', ['recordType' => 'CLIENT', 'record' => $patient])
+            </div>
         </div>
+        
         {{--<div class="d-flex align-items-baseline mb-3">
             <span class="width-200px">RM Reasons:</span>
             <div class="ml-3">

resources/views/app/patient/partials/sticky-notes-history.blade.php

@@ -0,0 +1,42 @@
+<?php
+
+use App\Models\ClientStickyNote;
+
+$recentStickyNotes = ClientStickyNote::where('client_id', $patient->id)->orderBy('created_at', 'DESC')->limit(5)->get();
+?>
+<div moe relative wide center class="ml-2 hide-inside-popup">
+	<a start show><i class="fas fa-history fa-fw on-hover-opaque"></i></a>
+	<form url="" class="mcp-theme-1">
+		<div>
+			<div class="d-flex align-items-center justify-content-between pb-2 mb-1">
+				<h5 class="mb-0 font-weight-bold">Recent Sticky Notes</h5>
+				<button cancel class="btn btn-sm btn-default border">
+					<i class="fas fa-times"></i>
+				</button>
+			</div>
+			<table class="table table-sm table-striped table-bordered">
+				<thead class="bg-light">
+					<tr>
+						<th class="border-bottom-0">Date</th>
+						<th class="border-bottom-0">Note</th>
+						<th class="border-bottom-0">Created By</th>
+					</tr>
+				</thead>
+				<tbody>
+					@foreach($recentStickyNotes as $sn)
+					<tr>
+						<td>{{ friendly_date_time($sn->created_at) }}</td>
+						<td style="max-width: 400px;"><?= nl2br($sn->sticky_note) ?></td>
+						<td>{{ $sn->createdBy->pro->displayName() }}</td>
+					</tr>
+					@endforeach
+					@if(!count($recentStickyNotes))
+						<tr>
+							<td colspan="4">No records found</td>
+						</tr>
+					@endif
+				</tbody>
+			</table>
+		</div>
+	</form>
+</div>

resources/views/app/patient/partials/update-best-time-to-call.blade.php

@@ -0,0 +1,14 @@
+<div moe relative>
+	<a start show><i class="fas fa-edit on-hover-opaque"></i></a>
+	<form url="/api/client/updateBestTimeToCall" class="mcp-theme-1" right>
+		<input type="hidden" name="uid" value="{{$patient->uid}}">
+		<div class="mb-2">
+			<label>Best Time To Call</label>
+			<input type="text" class="form-control form-control-sm" name="bestTimeToCall" value="{{ $patient->best_time_to_call }}" />
+		</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>

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

@@ -0,0 +1,83 @@
+<span moe class="hide-inside-popup">
+	<a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+	<form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+		<input type="hidden" name="uid" value="{{$patient->uid}}">
+		<div id="updateMcpOnboardingVisit" 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>
+					<option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+					<option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+					<option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+				</select>
+			</div>
+			<div class="mb-2">
+				<input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
+			</div>
+			<div class="mb-2">
+				<select name="mcpOnboardingVisitNoteUid" disabled class="form-control form-control-sm if-visit-done" onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
+					<option value="">-- Visit Note --</option>
+					<?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
+					@foreach ($notes as $note)
+					@if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
+					<option {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }} value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
+					@endif
+					@endforeach
+					{{--<option value="-- create --">-- Create Note --</option>--}}
+				</select>
+			</div>
+			<div class="mb-2 if-note-outside-system">
+				<textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
+			</div>
+			<div>
+			<small v-if="showEnterInfoAlert" class="d-block text-info text-sm mb-2">*Ensure you select Visit Note or type Reason before submitting.</small>
+			</div>
+		</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>
+</span>
+
+<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);
+					});
+					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();
+			});
+		}
+	});
+</script>

resources/views/app/patient/primary-coverage-manual-determination-commercial-modal.blade.php

@@ -1,19 +1,30 @@
 <div id="manual-determination-form-{{$patient->uid}}">
 	@php
-	$cpc = $patient->latestClientPrimaryCoverage;
+	$cpc = $patient->latestClientPrimaryCoverage;	
 	@endphp
+	
 	<div class="p-3">
-		@if($cpc->mcd_number)
-		<div class="mb-2">
-			<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
-			<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
-		</div>
-		@endif
-		@if($cpc->mcr_number)
-		<div class="mb-2">
-			<b>Medicare Number:</b> {{$cpc->mcr_number}}
+		<div class="d-flex flex-wrap">
+			@if($cpc->mcd_number)
+			<div class="mb-2 mr-2">
+				<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
+				<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+			</div>
+			@endif
+			@if($cpc->commercial_payer_id && $cpc->payer)
+			<div class="mb-2 mr-2">
+				<span><b>Payer:</b> {{$cpc->payer->name}}</span>
+			</div>
+			@endif
+			@if($cpc->mcr_number)
+			<div class="mb-2 mr-2">
+				<b>Medicare Number:</b> {{$cpc->mcr_number}}
+			</div>
+			@endif
+			<div class="mb-2 mr-2">
+				<span><b>Is Covered:</b> {{$cpc->is_covered}}</span>
+			</div>
 		</div>
-		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">

resources/views/app/patient/primary-coverage-manual-determination-medicaid-modal.blade.php

@@ -3,12 +3,17 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
-		@if($cpc->mcd_number)
-		<div class="mb-2">
-			<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
-			<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+		<div class="d-flex flex-wrap">
+			@if($cpc->mcd_number)
+			<div class="mb-2">
+				<span><b>Medicaid Number:</b> {{$cpc->mcd_number}}</span>
+				<span class="ml-3"><b>Medicaid State:</b> {{$cpc->mcd_payer_id ? $cpc->mcdPayer->name : '-'}}</span>
+			</div>
+			@endif
+			<div class="mb-2 mr-2">
+				<span><b>Is Covered:</b> {{$cpc->is_covered}}</span>
+			</div>
 		</div>
-		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">

resources/views/app/patient/primary-coverage-manual-determination-medicare-modal.blade.php

@@ -3,11 +3,16 @@
 	$cpc = $patient->latestClientPrimaryCoverage;
 	@endphp
 	<div class="p-3">
-		@if($cpc->mcr_number)
-		<div class="mb-2">
-			<b>Medicare Number:</b> {{$cpc->mcr_number}}
+		<div class="d-flex flex-wrap">
+			@if($cpc->mcr_number)
+			<div class="mb-2">
+				<b>Medicare Number:</b> {{$cpc->mcr_number}}
+			</div>
+			@endif
+			<div class="mb-2 mr-2">
+				<span><b>Is Covered:</b> {{$cpc->is_covered}}</span>
+			</div>
 		</div>
-		@endif
 		<form @submit.prevent="submitForm" method="post" class="mcp-theme-1">
 			<input type="hidden" name="clientPrimaryCoverageUid" value="{{$cpc->uid}}" class="form-control input-sm" />
 			<div class="row">

resources/views/app/practice-management/rm-launch-and-clean.blade.php

@@ -131,7 +131,7 @@
                     <th>Company Location Id</th>
                     <th>Has Anyone Interacted With Client About Rm Outside Note</th>
                     <th>Rm Num Measurements Not Stamped By Mcp</th>
-                    <th>Rm Num Measurements Not Stamped By Non Hcp</th>
+                    <th>Rm Num Measurements Not Stamped By Non HCP</th>
                     <th>Rm Num Measurements Not Stamped By Rmm</th>
                     <th>Rm Num Measurements Not Stamped By Rme</th>
                     <th>Has Mcp Rm Interacted By Note</th>

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

@@ -84,7 +84,7 @@ $addressParts .= implode(", ", $addressPart2);
           (<b>{{round($patient->most_recent_cellular_weight_value, 1)}}</b>@if($patient->most_recent_cellular_weight_measurement_at), {{friendly_date_short($patient->most_recent_cellular_weight_measurement_at)}}@endif)
           @endif
         </div>
-        
+
 
         <?php $currentCareMonth = $patient->currentCareMonth(); ?>
         @if($currentCareMonth && ($pro->pro_type === 'ADMIN' || $pro->id === $currentCareMonth->mcp_pro_id))
@@ -166,9 +166,116 @@ $addressParts .= implode(", ", $addressPart2);
       </div> -->
       <div class="position-relative ml-2">
         <div class="screen-only">
+          <div>
+            <label>MCP:</label> {{$mcpName}} 
+            @if($patient->has_mcp_done_onboarding_visit === 'YES')
+              <i class="fa fa-check text-sm" title="MCP Onboarding Visit Completed"></i>
+            @endif
+            @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+              <form url="/api/client/putMcp" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">MCP Pro</label>
+                  <select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
+                    <option value=""> --select--</option>
+                    @foreach($pros as $iPro)
+                    <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                    @endforeach
+                  </select>
+                </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>
+            @if($patient->mcp)
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-times on-hover-opaque"></i></a>
+              <form url="/api/client/removeMcp" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Remove MCP Pro</label>
+
+                </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>
+            @endif
+            @endif
+            @if($patient->mcp && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->mcp->uid)
+            <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->mcp->uid}}';" method="POST" target="_top" class="d-inline-block">
+              @csrf
+              <input type="hidden" name="proUid" value="{{$patient->mcp->uid}}">
+              <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
+            </form>
+            @endif
+          </div>
+          <div>
+            <label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
+            @if($pro->pro_type == 'ADMIN')
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
+              <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Care Coordinator</label>
+                  <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
+                    <option value=""> --select--</option>
+                    @foreach($pros as $iPro)
+                    <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                    @endforeach
+                  </select>
+                </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>
+            @if($patient->pcp)
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-times"></i></a>
+              <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="text-secondary text-sm">Remove Care Coordinator</label>
+
+                </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>
+            @endif
+            @endif
+            @if($patient->defaultNaPro && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->defaultNaPro->uid)
+            <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->defaultNaPro->uid}}';" method="POST" target="_top" class="d-inline-block">
+              @csrf
+              <input type="hidden" name="proUid" value="{{$patient->defaultNaPro->uid}}">
+              <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
+            </form>
+            @endif
+          </div>
           <div class="">
             <span>Status:</small>
-            <b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
+            {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
 
             @if($pro->pro_type == 'ADMIN')
             <div moe class="ml-2 hide-inside-popup">
@@ -211,49 +318,7 @@ $addressParts .= implode(", ", $addressPart2);
                 <span>MCP Onboarding Visit Pending</span>
               </span>
             </span>
-            <span moe class="hide-inside-popup">
-              <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-              <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
-                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                <div class="mb-2">
-                  <select name="hasMcpDoneOnboardingVisit" class="form-control form-control-sm" onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
-                    <option value="">-- Select Status --</option>
-                    <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
-                    <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
-                    <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                  </select>
-                </div>
-                <div class="mb-2">
-                  <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
-                </div>
-                <div class="mb-2">
-                  <select name="mcpOnboardingVisitNoteUid" disabled class="form-control form-control-sm if-visit-done" onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
-                    <option value="">-- Visit Note --</option>
-                    <?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
-                    @foreach ($notes as $note)
-                    @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
-                    <option {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }} value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
-                    @endif
-                    @endforeach
-                    {{--<option value="-- create --">-- Create Note --</option>--}}
-                  </select>
-                </div>
-                <div class="mb-2 if-note-outside-system">
-                  <textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
-                </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>
-            </span>
-            @else
-            <span class="text-dark d-inline-flex align-items-center">
-              <span class="mr-2 text-secondary">
-                <i class="fa fa-check text-sm"></i>
-                <span>MCP Onboarding Visit Completed</span>
-              </span>
-            </span>
+            @include('app.patient.partials.update-mcp-onboarding-visit-info')
             @endif
           </div>
         </div>
@@ -296,65 +361,11 @@ $addressParts .= implode(", ", $addressPart2);
 
 
     @if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
-    <div class="d-flex bg-light p-2 border header-coverage-status">
+    <div class="d-flex bg-light p-2 border header-coverage-status" style="max-width: 305px;">
       @include('app.patient.coverage-status')
     </div>
     @endif
-    <div class="bg-light p-2 border">
-      <div>
-        <label>MCP:</label> {{$mcpName}}
-        @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-          <form url="/api/client/putMcp" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">MCP Pro</label>
-              <select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
-                <option value=""> --select--</option>
-                @foreach($pros as $iPro)
-                <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                @endforeach
-              </select>
-            </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>
-        @if($patient->mcp)
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-times on-hover-opaque"></i></a>
-          <form url="/api/client/removeMcp" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Remove MCP Pro</label>
-
-            </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>
-        @endif
-        @endif
-        @if($patient->mcp && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->mcp->uid)
-        <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->mcp->uid}}';" method="POST" target="_top" class="d-inline-block">
-          @csrf
-          <input type="hidden" name="proUid" value="{{$patient->mcp->uid}}">
-          <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
-        </form>
-        @endif
-      </div>
+    <div class="bg-light p-2 border d-none">
       @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
       <div>
         <label>Status (mcp):</label>
@@ -394,56 +405,7 @@ $addressParts .= implode(", ", $addressPart2);
         </div>
       </div>
       @endif
-      <div>
-        <label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
-        @if($pro->pro_type == 'ADMIN')
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
-          <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Care Coordinator</label>
-              <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
-                <option value=""> --select--</option>
-                @foreach($pros as $iPro)
-                <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                @endforeach
-              </select>
-            </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>
-        @if($patient->pcp)
-        <div moe class="ml-2 hide-inside-popup">
-          <a start show><i class="fa fa-times"></i></a>
-          <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-              <label class="text-secondary text-sm">Remove Care Coordinator</label>
-
-            </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>
-        @endif
-        @endif
-        @if($patient->defaultNaPro && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->defaultNaPro->uid)
-        <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->defaultNaPro->uid}}';" method="POST" target="_top" class="d-inline-block">
-          @csrf
-          <input type="hidden" name="proUid" value="{{$patient->defaultNaPro->uid}}">
-          <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
-        </form>
-        @endif
-      </div>
+      
       @if($patient->defaultNaPro && $patient->defaultNaPro->id === $pro->id || $pro->pro_type == 'ADMIN')
       <div>
         <label>Status (cc):</label>
@@ -485,10 +447,11 @@ $addressParts .= implode(", ", $addressPart2);
       @endif
     </div>
 
-    <div class="bg-light p-2 border" style="max-width: 215px;">
+    <div class="bg-light p-2 border ml-auto" style="max-width: 215px;">
       <div>
         <div class="d-flex">
           <label class="">Sticky Note:</label>
+          @include('app.patient.partials.sticky-notes-history')
           <div moe relative wide class="ml-2 hide-inside-popup">
             <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
             <form url="/api/client/updateStickyNote" class="mcp-theme-1" right>

resources/views/layouts/patient.blade.php

@@ -255,12 +255,12 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 		@endif
 		<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
 			@if($pro->is_enrolled_as_mcp && !$patient->mcp)
-			<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
-				<div class="font-size-16">
+			<div class="d-flex align-items-center alert alert-info bg-white mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
+				<div class="font-size-16 mr-3">
 					<i class="fa fa-exclamation-triangle text-warning-mellow"></i>
 					This patient currently does not have an MCP assigned.
 				</div>
-				<div class="mt-3 d-flex align-items-center">
+				<div class="d-flex align-items-center">
 					<button class="btn btn-info" onclick="$('.in-conv-confirmed').removeClass('d-none').addClass('d-inline-flex')">I am currently seeing or talking to this patient</button>
 					<div class="in-conv-confirmed d-none align-items-center">
 						<i class="fa fa-chevron-right mx-3 text-secondary"></i>
@@ -302,8 +302,9 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 					</div>
 				</div>
 				@if($pro->pro_type === 'ADMIN')
-				<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
-					<b class="">Tags ({{count($patient->clientTags)}}):</b>
+				<div class="screen-only card-header py-2 d-flex align-items-start justify-content-between mcp-theme-1 bg-aliceblue hide-inside-popup">
+					<div class="d-flex align-items-center">
+						<b class="">Tags ({{count($patient->clientTags)}}):</b>
 					@foreach($patient->clientTags as $tag)
 					<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
 						<span class="text-sm">{{$tag->tag}}</span>
@@ -334,6 +335,13 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 							</div>
 						</form>
 					</div>
+					</div>
+
+					<div>
+						<span class="mr-2"><b>Best Time to Call:</b> {{ $patient->best_time_to_call ?? '-' }}</span>
+						@include('app.patient.partials.update-best-time-to-call')
+					</div>
+					
 				</div>
 				@endif
 				{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">

resources/views/layouts/template.blade.php

@@ -193,6 +193,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.visitTemplates') }}">Visit Templates</a>
                             <a class="dropdown-item" href="{{ route('admin.part_b_patients') }}">Part B Patients</a>
                             <a class="dropdown-item" href="{{ route('admin.bdt_devices') }}">BDT Devices</a>
+                            <a class="dropdown-item" href="{{ route('admin.patientsMissingDefasultSettings') }}">Patients Missing Default Settings</a>
                         @elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
 
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>

routes/web.php

@@ -219,7 +219,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('reports', 'AdminController@reports')->name('reports');
         Route::get('supply-orders', 'AdminController@supply_orders')->name('supply_orders');
         Route::get('get-create-new-patient-script-template', 'AdminController@getCreateNewPatientScriptTemplate')->name('getCreateNewPatientScriptTemplate');
-    
+        Route::get('patients-missing-defult-settings', 'AdminController@patientsMissingDefasultSettings')->name('patientsMissingDefasultSettings');
        
     });