Browse Source

added coverage UI

= 3 năm trước cách đây
mục cha
commit
a1a0ca3691

+ 484 - 22
resources/views/app/patient/client-primary-coverages.blade.php

@@ -4,31 +4,31 @@
 <div>
     <div class="mb-3 border rounded bg-light p-2">
         <div class="mb-2">
-            Latest Client Primary Coverage: 
+            Latest Client Primary Coverage:
             @if($patient->latestClientPrimaryCoverage)
                 <b>{{$patient->latestClientPrimaryCoverage->plan_type}}</b> (Member ID: {{$patient->latestClientPrimaryCoverage->payer_member_identifier}})
-            @else 
+            @else
                 -
             @endif
         </div>
         <div class="mb-2">Latest New Client Primary Coverage:
             @if($patient->latestNewClientPrimaryCoverage)
                 <b>{{$patient->latestNewClientPrimaryCoverage->plan_type}}</b> (Member ID: {{$patient->latestNewClientPrimaryCoverage->payer_member_identifier}})
-            @else 
+            @else
                 -
             @endif
         </div>
         <div class="mb-2">Latest Auto Refresh Client Primary Coverage:
             @if($patient->latestAutoRefreshClientPrimaryCoverage)
                 <b>{{$patient->latestAutoRefreshClientPrimaryCoverage->plan_type}}</b> (Member ID: {{$patient->latestAutoRefreshClientPrimaryCoverage->payer_member_identifier}})
-            @else 
+            @else
                 -
             @endif
         </div>
         <div class="">Latest Manual Client Primary Coverage:
             @if($patient->latestManualClientPrimaryCoverage)
                 <b>{{$patient->latestManualClientPrimaryCoverage->plan_type}}</b> (Member ID: {{$patient->latestManualClientPrimaryCoverage->payer_member_identifier}})
-            @else 
+            @else
                 -
             @endif
         </div>
@@ -104,7 +104,7 @@
                         <label for="" class="control-label">Date Of Service</label>
                         <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
                     </div>
-                   
+
                     <div class="form-group text-nowrap mb-0">
                         <button class="btn btn-sm btn-primary" submit>Submt</button>
                         <button class="btn btn-sm btn-default border" close>Close</button>
@@ -148,7 +148,100 @@
                         <label class="control-label">Date Of Service</label>
                         <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
                     </div>
-                    
+
+                    <div class="form-group text-nowrap mb-0">
+                        <button class="btn btn-sm btn-primary" submit>Submt</button>
+                        <button class="btn btn-sm btn-default border" close>Close</button>
+                    </div>
+                </form>
+            </div>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <div moe relative large>
+                <a href="" start show >+ Mcr Adv.</a>
+                <form url="/api/clientPrimaryCoverage/createNewCoverageForMcrAdvWithoutManualDetermination" right class="mcp-theme-1">
+                    <input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name First</label>
+                        <input type="text" name="subscriberNameFirst" class="form-control input-sm" value="{{$patient->name_first}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name Last</label>
+                        <input type="text" name="subscriberNameLast" class="form-control input-sm" value="{{$patient->name_last}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Dob</label>
+                        <input type="date" name="subscriberDob" class="form-control input-sm" value="{{$patient->dob}}">
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Subscriber Sex</label>
+                        <select  name="subscriberSex" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="M" {{$patient->sex === 'M' ? 'selected' : ''}}>M</option>
+                            <option value="F" {{$patient->sex === 'F' ? 'selected' : ''}}>F</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Payer Member Identifier</label>
+                        <input type="text" name="payerMemberIdentifier" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicare Number</label>
+                        <input type="text" name="mcrNumber" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Date Of Service</label>
+                        <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
+                    </div>
+
+                    <div class="form-group text-nowrap mb-0">
+                        <button class="btn btn-sm btn-primary" submit>Submt</button>
+                        <button class="btn btn-sm btn-default border" close>Close</button>
+                    </div>
+                </form>
+            </div>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <div moe relative large>
+                <a href="" start show >+ Mcd Mco.</a>
+                <form url="/api/clientPrimaryCoverage/createNewCoverageForMcdMcoWithoutManualDetermination" right class="mcp-theme-1">
+                    <input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name First</label>
+                        <input type="text" name="subscriberNameFirst" class="form-control input-sm" value="{{$patient->name_first}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name Last</label>
+                        <input type="text" name="subscriberNameLast" class="form-control input-sm" value="{{$patient->name_last}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Dob</label>
+                        <input type="date" name="subscriberDob" class="form-control input-sm" value="{{$patient->dob}}">
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Subscriber Sex</label>
+                        <select  name="subscriberSex" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="M" {{$patient->sex === 'M' ? 'selected' : ''}}>M</option>
+                            <option value="F" {{$patient->sex === 'F' ? 'selected' : ''}}>F</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label class="control-label">Payer Member Identifier</label>
+                        <input type="text" name="payerMemberIdentifier" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicaid Number</label>
+                        <input type="text" name="mcdNumber" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicaid State</label>
+                        <input type="text" name="mcdState" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Date Of Service</label>
+                        <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
+                    </div>
+
                     <div class="form-group text-nowrap mb-0">
                         <button class="btn btn-sm btn-primary" submit>Submt</button>
                         <button class="btn btn-sm btn-default border" close>Close</button>
@@ -198,7 +291,7 @@
                             <option value="NOT_COVERED">Not Covered</option>
                             <option value="INVALID">Invalid</option>
                             <option value="UNKNOWN">Unknown</option>
-                        </select>                        
+                        </select>
                     </div>
                     <div class="form-group">
                         <label for="" class="control-label">Manual Determination Category Memo</label>
@@ -334,7 +427,7 @@
                             <option value="NOT_COVERED">Not Covered</option>
                             <option value="INVALID">Invalid</option>
                             <option value="UNKNOWN">Unknown</option>
-                        </select>                        
+                        </select>
                     </div>
                     <div class="form-group">
                         <label for="" class="form-control-label">Manual Determination Category Memo</label>
@@ -387,7 +480,7 @@
                         <label class="control-label">Date Of Service</label>
                         <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
                     </div>
-                   
+
                     <div class="form-group">
                         <label for="" class="control-label">Manual Determination Strategy</label>
                         <select  name="manualDeterminationStrategy" class="form-control input-sm">
@@ -404,7 +497,7 @@
                             <option value="NOT_COVERED">Not Covered</option>
                             <option value="INVALID">Invalid</option>
                             <option value="UNKNOWN">Unknown</option>
-                        </select>                        
+                        </select>
                     </div>
                     <div class="form-group">
                         <label for="" class="control-label">Manual Determination Category Memo</label>
@@ -420,6 +513,209 @@
                     </div>
                 </form>
             </div>
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <div moe relative large>
+                <a href="" start show >+ Mcr Adv.</a>
+                <form url="/api/clientPrimaryCoverage/createNewCoverageForMcrAdvWithManualDetermination" right class="mcp-theme-1">
+                    <input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name First</label>
+                        <input type="text" name="subscriberNameFirst" class="form-control input-sm" value="{{$patient->name_first}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name Last</label>
+                        <input type="text" name="subscriberNameLast" class="form-control input-sm" value="{{$patient->name_last}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Dob</label>
+                        <input type="date" name="subscriberDob" class="form-control input-sm" value="{{$patient->dob}}">
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Subscriber Sex</label>
+                        <select  name="subscriberSex" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="M" {{$patient->sex === 'M' ? 'selected' : ''}}>M</option>
+                            <option value="F" {{$patient->sex === 'F' ? 'selected' : ''}}>F</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Payer Member Identifier</label>
+                        <input type="text" name="payerMemberIdentifier" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicare Number</label>
+                        <input type="text" name="mcrNumber" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Date Of Service</label>
+                        <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Strategy</label>
+                        <select  name="manualDeterminationStrategy" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="REVIEWED_ELECTRONIC">Reviewed electronic</option>
+                            <option value="CALLED_PAYER">Called payer</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Category</label>
+                        <select  name="manualDeterminationCategory" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="COVERED">Covered</option>
+                            <option value="NOT_COVERED">Not Covered</option>
+                            <option value="INVALID">Invalid</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Category Memo</label>
+                        <textarea name="manualDeterminationCategoryMemo" class="form-control input-sm"></textarea>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Detail Json</label>
+                        <textarea name="manualDetailJson" class="form-control input-sm"></textarea>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Payer Member Identifier Valid</label>
+                        <select  name="manualIsPayerMemberIdentifierValid" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Mcr Number Valid</label>
+                        <select  name="manualIsMcrNumberValid" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Mcr Part Bprimary</label>
+                        <select  name="manualIsMcrPartBPrimary" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Mcr Part C Active</label>
+                        <select  name="manualIsMcrPartCActive" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                    <div class="form-group text-nowrap mb-0">
+                        <button class="btn btn-sm btn-primary" submit>Submt</button>
+                        <button class="btn btn-sm btn-default border" close>Close</button>
+                    </div>
+                </form>
+            </div>
+
+            <span class="mx-2 text-secondary text-sm">|</span>
+            <div moe relative large>
+                <a href="" start show >+ Mcd Mco.</a>
+                <form url="/api/clientPrimaryCoverage/createNewCoverageForMcdMcoWithManualDetermination" right class="mcp-theme-1">
+                    <input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name First</label>
+                        <input type="text" name="subscriberNameFirst" class="form-control input-sm" value="{{$patient->name_first}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Name Last</label>
+                        <input type="text" name="subscriberNameLast" class="form-control input-sm" value="{{$patient->name_last}}">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Subscriber Dob</label>
+                        <input type="date" name="subscriberDob" class="form-control input-sm" value="{{$patient->dob}}">
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Subscriber Sex</label>
+                        <select  name="subscriberSex" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="M" {{$patient->sex === 'M' ? 'selected' : ''}}>M</option>
+                            <option value="F" {{$patient->sex === 'F' ? 'selected' : ''}}>F</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Payer Member Identifier</label>
+                        <input type="text" name="payerMemberIdentifier" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicaid Number</label>
+                        <input type="text" name="mcrNumber" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Medicaid State</label>
+                        <input type="text" name="mcdState" class="form-control input-sm">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Date Of Service</label>
+                        <input type="date" name="dateOfService" class="form-control input-sm" value="{{date('Y-m-d')}}">
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Strategy</label>
+                        <select  name="manualDeterminationStrategy" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="REVIEWED_ELECTRONIC">Reviewed electronic</option>
+                            <option value="CALLED_PAYER">Called payer</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Category</label>
+                        <select  name="manualDeterminationCategory" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="COVERED">Covered</option>
+                            <option value="NOT_COVERED">Not Covered</option>
+                            <option value="INVALID">Invalid</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Determination Category Memo</label>
+                        <textarea name="manualDeterminationCategoryMemo" class="form-control input-sm"></textarea>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Detail Json</label>
+                        <textarea name="manualDetailJson" class="form-control input-sm"></textarea>
+                    </div>
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Mcd Number Valid</label>
+                        <select  name="manualIsMcdNumberValid" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="" class="control-label">Manual Is Mcd Response Mco Active</label>
+                        <select  name="manualIsMcdResponseMcoActive" class="form-control input-sm">
+                            <option value="">--select--</option>
+                            <option value="YES">Yes</option>
+                            <option value="NO">No</option>
+                            <option value="UNKNOWN">Unknown</option>
+                        </select>
+                    </div>
+                    <div class="form-group text-nowrap mb-0">
+                        <button class="btn btn-sm btn-primary" submit>Submt</button>
+                        <button class="btn btn-sm btn-default border" close>Close</button>
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 
@@ -555,7 +851,7 @@
                                     <option value="NOT_COVERED">Not Covered</option>
                                     <option value="INVALID">Invalid</option>
                                     <option value="UNKNOWN">Unknown</option>
-                                </select>                        
+                                </select>
                             </div>
                             <div class="form-group">
                                 <label for="" class="control-label">Manual Determination Category Memo</label>
@@ -670,7 +966,7 @@
                             </div>
                         </form>
                     </div>
-                    @endif 
+                    @endif
                     @if($cpc->plan_type == 'MEDICAID')
                     <div moe relative>
                         <a href="" start show class="">Refresh</a>
@@ -707,7 +1003,7 @@
                                     <option value="NOT_COVERED">Not Covered</option>
                                     <option value="INVALID">Invalid</option>
                                     <option value="UNKNOWN">Unknown</option>
-                                </select>                        
+                                </select>
                             </div>
                             <div class="form-group">
                                 <label for="" class="control-label">Manual Determination Category Memo</label>
@@ -717,15 +1013,15 @@
                                 <label for="" class="control-label">Manual Detail Json</label>
                                 <input type="text" name="manualDetailJson" class="form-control input-sm"/>
                             </div>
-                           
-                           
+
+
                             <div class="form-group text-nowrap mb-0">
                                 <button class="btn btn-sm btn-primary" submit>Submt</button>
                                 <button class="btn btn-sm btn-default border" close>Close</button>
                             </div>
                         </form>
                     </div>
-                    @endif 
+                    @endif
                     @if($cpc->plan_type == 'COMMERCIAL')
                     <div moe relative>
                         <a href="" start show class="">Refresh</a>
@@ -762,7 +1058,7 @@
                                     <option value="NOT_COVERED">Not Covered</option>
                                     <option value="INVALID">Invalid</option>
                                     <option value="UNKNOWN">Unknown</option>
-                                </select>                        
+                                </select>
                             </div>
                             <div class="form-group">
                                 <label for="" class="control-label">Manual Determination Category Memo</label>
@@ -772,15 +1068,181 @@
                                 <label for="" class="control-label">Manual Detail Json</label>
                                 <input type="text" name="manualDetailJson" class="form-control input-sm"/>
                             </div>
-                            
-                           
+
+
                             <div class="form-group text-nowrap mb-0">
                                 <button class="btn btn-sm btn-primary" submit>Submt</button>
                                 <button class="btn btn-sm btn-default border" close>Close</button>
                             </div>
                         </form>
                     </div>
-                    @endif 
+                    @endif
+                    @if($cpc->plan_type == 'MCR_ADV')
+                        <div moe relative>
+                            <a href="" start show class="">Refresh</a>
+
+                            <form url="/api/clientPrimaryCoverage/refreshCoverageForMcrAdv" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$cpc->uid}}" class="form-control input-sm" />
+                                <div class="form-group">
+                                    <p>Refresh?</p>
+                                </div>
+                                <div class="form-group text-nowrap mb-0">
+                                    <button class="btn btn-sm btn-primary" submit>Submt</button>
+                                    <button class="btn btn-sm btn-default border" close>Close</button>
+                                </div>
+                            </form>
+                        </div>
+                        <div moe relative large>
+                            <a href="" start show class="">Manual Determination</a>
+                            <form url="/api/clientPrimaryCoverage/manualDeterminationForMcrAdv" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$cpc->uid}}" class="form-control input-sm" />
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Strategy</label>
+                                    <select  name="manualDeterminationStrategy" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="REVIEWED_ELECTRONIC">Reviewed electronic</option>
+                                        <option value="CALLED_PAYER">Called payer</option>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Category</label>
+                                    <select  name="manualDeterminationCategory" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="COVERED">Covered</option>
+                                        <option value="NOT_COVERED">Not Covered</option>
+                                        <option value="INVALID">Invalid</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Category Memo</label>
+                                    <input type="text" name="manualDeterminationCategoryMemo" class="form-control input-sm"/>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Detail Json</label>
+                                    <input type="text" name="manualDetailJson" class="form-control input-sm"/>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Payer Member Identifier Valid</label>
+                                    <select  name="manualIsPayerMemberIdentifierValid" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Mcr Number Valid</label>
+                                    <select  name="manualIsMcrNumberValid" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Mcr Part Bprimary</label>
+                                    <select  name="manualIsMcrPartBPrimary" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Mcr Part C Active</label>
+                                    <select  name="manualIsMcrPartCActive" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group text-nowrap mb-0">
+                                    <button class="btn btn-sm btn-primary" submit>Submt</button>
+                                    <button class="btn btn-sm btn-default border" close>Close</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                    @if($cpc->plan_type == 'MCD_MCO')
+                        <div moe relative>
+                            <a href="" start show class="">Refresh</a>
+
+                            <form url="/api/clientPrimaryCoverage/refreshCoverageForMcdMco" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$cpc->uid}}" class="form-control input-sm" />
+                                <div class="form-group">
+                                    <p>Refresh?</p>
+                                </div>
+                                <div class="form-group text-nowrap mb-0">
+                                    <button class="btn btn-sm btn-primary" submit>Submt</button>
+                                    <button class="btn btn-sm btn-default border" close>Close</button>
+                                </div>
+                            </form>
+                        </div>
+                        <div moe relative large>
+                            <a href="" start show class="">Manual Determination</a>
+                            <form url="/api/clientPrimaryCoverage/manualDeterminationForMcdMco" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$cpc->uid}}" class="form-control input-sm" />
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Strategy</label>
+                                    <select  name="manualDeterminationStrategy" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="REVIEWED_ELECTRONIC">Reviewed electronic</option>
+                                        <option value="CALLED_PAYER">Called payer</option>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Category</label>
+                                    <select  name="manualDeterminationCategory" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="COVERED">Covered</option>
+                                        <option value="NOT_COVERED">Not Covered</option>
+                                        <option value="INVALID">Invalid</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Determination Category Memo</label>
+                                    <input type="text" name="manualDeterminationCategoryMemo" class="form-control input-sm"/>
+                                </div>
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Detail Json</label>
+                                    <input type="text" name="manualDetailJson" class="form-control input-sm"/>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Mcd Number Valid</label>
+                                    <select  name="manualIsMcdNumberValid" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="" class="control-label">Manual Is Mcd Response Mco Active</label>
+                                    <select  name="manualIsMcdResponseMcoActive" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="YES">Yes</option>
+                                        <option value="NO">No</option>
+                                        <option value="UNKNOWN">Unknown</option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group text-nowrap mb-0">
+                                    <button class="btn btn-sm btn-primary" submit>Submt</button>
+                                    <button class="btn btn-sm btn-default border" close>Close</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
                 </td>
                 <td>{{$cpc->creation_strategy}}</td>
                 <td>{{$cpc->auto_refresh_of_client_primary_coverage_id}}</td>
@@ -872,4 +1334,4 @@
         </tbody>
     </table>
 </div>
-@endsection
+@endsection

+ 204 - 0
resources/views/app/patient/coverage-status.blade.php

@@ -0,0 +1,204 @@
+<div>
+    @php
+        $coverage = $patient->latestClientPrimaryCoverage;
+    @endphp
+    @if(!$coverage)
+
+        No coverage info!
+
+    @elseif($coverage->plan_type === 'MEDICARE')
+        <div>
+            <table>
+                <tr>
+                    <td>Medicare</td>
+                </tr>
+                <tr>
+                    <td>MCR #</td>
+                    <td>{{$coverage->payer_member_identifier}}</td>
+                </tr>
+                <tr>
+                    <td>Valid number?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_payer_member_identifier_valid}}
+                        @else
+                            {{$coverage->auto_is_payer_member_identifier_valid}}
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Coverage active? (PBP?)</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
+                        @else
+                            {{$coverage->is_partbprimary ? 'Covered' : 'Not Covered'}}
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </div>
+    @elseif($coverage->plan_type === 'MEDICAID')
+        <div>
+            <table>
+                <tr>
+                    <td>Medicare</td>
+                </tr>
+                <tr>
+                    <td>MCR #</td>
+                    <td>{{$coverage->payer_member_identifier}}</td>
+                </tr>
+                <tr>
+                    <td>Valid number?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_payer_member_identifier_valid}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Coverage active? (PBP?)</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </div>
+    @elseif($coverage->plan_type === 'COMMERCIAL')
+        <div>
+            <table>
+                <tr>
+                    <td>COMMERCIAL</td>
+                </tr>
+                <tr>
+                    <td>MCR #</td>
+                    <td>{{$coverage->payer_member_identifier}}</td>
+                </tr>
+                <tr>
+                    <td>Valid number?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_payer_member_identifier_valid}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Coverage active?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </div>
+    @elseif($coverage->plan_type === 'MCR_ADV')
+        <div>
+            <table>
+                <tr>
+                    <td>Medicare Advantage</td>
+                </tr>
+                <tr>
+                    <td>Member #</td>
+                    <td>{{$coverage->payer_member_identifier}}</td>
+                </tr>
+                <tr>
+                    <td>MCR #</td>
+                    <td>{{$coverage->mcr_number}}</td>
+                </tr>
+                <tr>
+                    <td>Valid Member #?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_payer_member_identifier_valid}}
+                        @else
+                            {{$coverage->auto_is_payer_member_identifier_valid}}
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Valid MCR #?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_mcr_number_valid}}
+                        @else
+                            {{$coverage->auto_is_mcr_number_valid}}
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Coverage active?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_determination_category === 'COVERED'? 'Covered' : 'Not Covered'}}
+                        @else
+                            {{$coverage->manual_is_mcr_partbprimary === 'NO' && $coverage->manual_is_mcr_partcactive === 'NO' ? 'Covered' : 'Not Covered'}}
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Is Part B Primary?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_mcr_partbprimary}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Is Part C Active?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_mcr_partcactive}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </div>
+    @elseif($coverage->plan_type === 'MCD_MCO')
+        <div>
+            <table>
+                <tr>
+                    <td>Medicaid MCO</td>
+                </tr>
+                <tr>
+                    <td>MCD #</td>
+                    <td>{{$coverage->payer_member_identifier}}</td>
+                </tr>
+                <tr>
+                    <td>Valid number?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_mcd_number_valid}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+                <tr>
+                    <td>Coverage active?</td>
+                    <td>
+                        @if($coverage->is_manually_determined)
+                            {{$coverage->manual_is_mcd_response_mco_active}}
+                        @else
+                            UNKNOWN
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </div>
+    @endif
+</div>

+ 1 - 0
resources/views/app/patients.blade.php

@@ -193,6 +193,7 @@
                             @if($coverage)
                                 {{$coverage->toString()}}
                             @endif
+                            @include('app.patient.coverage-status')
                         </td>
                         <td>
                             {{ $patient->mcp ? $patient->mcp->displayName() : '-' }}

+ 980 - 997
resources/views/layouts/patient.blade.php

@@ -3,1017 +3,1000 @@
 /** @var \App\Models\Client $patient */
 ?>
 @section('content')
-    <div class="container-fluid h-100">
-        <div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }}">
-            @if(!request()->input('popupmode'))
-            <nav id="sidebarMenu" class="d-md-block bg-light sidebar collapse px-0">
-                <div class="sidebar-sticky pt-3">
-                    <ul class="nav flex-column mcp-theme-1">
-                        <?php $routeName = request()->route()->getName(); ?>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.dashboard') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.dashboard', ['patient' => $patient]) }}">Dashboard</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.appointments') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.appointments', ['patient' => $patient, 'forPro' => 'all', 'status' => 'all']) }}">Appointments</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.flowsheets') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.flowsheets', ['patient' => $patient]) }}">Flowsheets</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.vitals-settings') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.vitals-settings', ['patient' => $patient]) }}">Vitals Settings</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.vitals-graph') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.vitals-graph', ['patient' => $patient]) }}">Vitals Graph</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.generic-bills') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.generic-bills', ['patient' => $patient]) }}">Generic Bills</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.sections') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.sections', ['patient' => $patient]) }}">Sections</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
-                        </li>
-                        <?php /* <li class="nav-item">
-                            <a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
-                               native onclick="return false">
-                                <span class="text-dark">ERx/Orders</span>
-                            </a>
-                            <ul class="m-0 p-0 nav-child-list">
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
-                                       href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
-                                       href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
-                                       href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
-                                       href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
-                                </li>
-                            </ul>
-                        </li> */ ?>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.patient-prescriptions') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.patient-prescriptions', ['patient' => $patient]) }}">Prescriptions</a>
-                            <?php /*
-                            <ul class="m-0 p-0 nav-child-list">
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === '' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => '']) }}">All</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'erx' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'erx']) }}">Drug</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'lab' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'imaging' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'referral' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'referral']) }}">Referral</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'supply' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'supply']) }}">Supply</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'other' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
-                                </li>
-                            </ul>
-                            */ ?>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.patient-tickets', ['patient' => $patient]) }}">ERx / Orders</a>
-                            <ul class="m-0 p-0 nav-child-list">
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">All</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'erx' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'erx']) }}">ERx</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'lab' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'imaging' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'other' ? 'active' : '' }}"
-                                       href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
-                                </li>
-                            </ul>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.supply-orders') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.supply-orders', ['patient' => $patient]) }}">Supply Orders</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.shipments') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.shipments', ['patient' => $patient]) }}">Shipments</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.incoming-reports') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.incoming-reports', ['patient' => $patient]) }}">Incoming Reports</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.medications') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.medications', ['patient' => $patient]) }}">Medications</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
-                                Focus Areas</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.care-team', ['patient' => $patient]) }}">Care Team</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.history') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.history', ['patient' => $patient]) }}">History</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.memos') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.memos', ['patient' => $patient]) }}">Memos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ $routeName === 'patients.view.sms' ? 'active' : '' }}"
-                               href="{{ route('patients.view.sms', ['patient' => $patient]) }}">SMS</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.sms-numbers') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.sms-numbers', ['patient' => $patient]) }}">SMS Numbers</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.documents') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.documents', ['patient' => $patient]) }}">Documents</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.settings') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.settings', ['patient' => $patient]) }}">Settings</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.sms-reminders') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.sms-reminders', ['patient' => $patient]) }}">SMS Reminders</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.measurement-confirmation-numbers') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.measurement-confirmation-numbers', ['patient' => $patient]) }}">Meas. Conf. Numbers</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.pros') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.pros', ['patient' => $patient]) }}">Pros</a>
-                        </li>
+	<div class="container-fluid h-100">
+		<div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }}">
+			@if(!request()->input('popupmode'))
+			<nav id="sidebarMenu" class="d-md-block bg-light sidebar collapse px-0">
+				<div class="sidebar-sticky pt-3">
+					<ul class="nav flex-column mcp-theme-1">
+						<?php $routeName = request()->route()->getName(); ?>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.dashboard') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.dashboard', ['patient' => $patient]) }}">Dashboard</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.appointments') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.appointments', ['patient' => $patient, 'forPro' => 'all', 'status' => 'all']) }}">Appointments</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.flowsheets') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.flowsheets', ['patient' => $patient]) }}">Flowsheets</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-settings') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.vitals-settings', ['patient' => $patient]) }}">Vitals Settings</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-graph') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.vitals-graph', ['patient' => $patient]) }}">Vitals Graph</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.generic-bills') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.generic-bills', ['patient' => $patient]) }}">Generic Bills</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.sections') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.sections', ['patient' => $patient]) }}">Sections</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
+						</li>
+						<?php /* <li class="nav-item">
+							<a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
+							   native onclick="return false">
+								<span class="text-dark">ERx/Orders</span>
+							</a>
+							<ul class="m-0 p-0 nav-child-list">
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
+								</li>
+							</ul>
+						</li> */ ?>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.patient-prescriptions') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.patient-prescriptions', ['patient' => $patient]) }}">Prescriptions</a>
+							<?php /*
+							<ul class="m-0 p-0 nav-child-list">
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === '' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => '']) }}">All</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'erx' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'erx']) }}">Drug</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'lab' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'imaging' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'referral' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'referral']) }}">Referral</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'supply' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'supply']) }}">Supply</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'other' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
+								</li>
+							</ul>
+							*/ ?>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.patient-tickets', ['patient' => $patient]) }}">ERx / Orders</a>
+							<ul class="m-0 p-0 nav-child-list">
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">All</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'erx' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'erx']) }}">ERx</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'lab' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'imaging' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'other' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
+								</li>
+							</ul>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.supply-orders') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.supply-orders', ['patient' => $patient]) }}">Supply Orders</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.shipments') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.shipments', ['patient' => $patient]) }}">Shipments</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.incoming-reports') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.incoming-reports', ['patient' => $patient]) }}">Incoming Reports</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.medications') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.medications', ['patient' => $patient]) }}">Medications</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
+								Focus Areas</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.care-team', ['patient' => $patient]) }}">Care Team</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.history') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.history', ['patient' => $patient]) }}">History</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.memos') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.memos', ['patient' => $patient]) }}">Memos</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ $routeName === 'patients.view.sms' ? 'active' : '' }}"
+							   href="{{ route('patients.view.sms', ['patient' => $patient]) }}">SMS</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.sms-numbers') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.sms-numbers', ['patient' => $patient]) }}">SMS Numbers</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.documents') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.documents', ['patient' => $patient]) }}">Documents</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.settings') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.settings', ['patient' => $patient]) }}">Settings</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.sms-reminders') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.sms-reminders', ['patient' => $patient]) }}">SMS Reminders</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.measurement-confirmation-numbers') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.measurement-confirmation-numbers', ['patient' => $patient]) }}">Meas. Conf. Numbers</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.pros') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.pros', ['patient' => $patient]) }}">Pros</a>
+						</li>
 {{--                        <li class="nav-item">--}}
 {{--                            <a class="nav-link" href="/patients/view/{{ $patient->uid }}/intake">Intake</a>--}}
 {{--                        </li>--}}
-                        @if($performer->pro->pro_type == 'ADMIN')
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.mcp-requests', $patient) }}">MCP Requests</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.eligible-refreshes') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.eligible-refreshes', $patient) }}">Eligible Refreshes</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.client-primary-coverages') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.client-primary-coverages', $patient) }}">Client Primary Coverage</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>
-                        </li>
-                        @endif
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.accounts') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.accounts', $patient) }}">Linked Accounts</a>
-                        </li>
-                    </ul>
-                    <div class="mt-3 mcp-theme-1">
-                        @yield('left-nav-content')
-                    </div>
-                </div>
-            </nav>
-            @endif
-            <main role="main" class="w-100">
-                @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">
-                        <div class="font-size-16">
-                            <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">
-                            <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>
-                                <div moe class=" hide-inside-popup">
-                                    <a href="" start show class="btn btn-primary font-weight-bold text-white">
-                                        Assign myself as the MCP for this patient
-                                    </a>
-                                    <form url="/api/client/putMcp" class="mcp-theme-1">
-                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                        <input type="hidden" name="mcpProUid" value="{{$pro->uid}}">
-                                        <p>Are you sure?</p>
-                                        <div>
-                                            <button submit class="btn btn-sm btn-primary mr-2">
-                                                Submit
-                                            </button>
-                                            <button cancel class="btn btn-sm btn-default border">
-                                                Cancel
-                                            </button>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                @endif
-                @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $patient->is_mcp_onboarding_active === 'NO')
-                    <div class="alert alert-warning mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
-                        <div class="font-weight-bold text-dark font-size-16">MCP onboarding is not active for this patient.</div>
-                        <div class="text-secondary p-2 border mt-2 bg-light">
-                            <div class="font-weight-bold">{{$patient->why_is_mcp_onboarding_not_active_category}}</div>
-                            <div>{{$patient->why_is_mcp_onboarding_not_active_memo}}</div>
-                        </div>
-                    </div>
-                @endif
-                <div class="card mt-3" id="patient-header">
-                    <div class="card-header py-1 hide-inside-ticket-popup">
-                        <?php
-                        $thumbnail = $patient->profile_picture_base64;
-                        $initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
-                        $online = $patient->is_online ? 'online' : '';
-                        $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
+						@if($performer->pro->pro_type == 'ADMIN')
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.mcp-requests', $patient) }}">MCP Requests</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.eligible-refreshes') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.eligible-refreshes', $patient) }}">Eligible Refreshes</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.client-primary-coverages') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.client-primary-coverages', $patient) }}">Client Primary Coverage</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>
+						</li>
+						@endif
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.accounts') === 0 ? 'active' : '' }}"
+							   href="{{ route('patients.view.accounts', $patient) }}">Linked Accounts</a>
+						</li>
+					</ul>
+					<div class="mt-3 mcp-theme-1">
+						@yield('left-nav-content')
+					</div>
+				</div>
+			</nav>
+			@endif
+			<main role="main" class="w-100">
+				@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">
+						<div class="font-size-16">
+							<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">
+							<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>
+								<div moe class=" hide-inside-popup">
+									<a href="" start show class="btn btn-primary font-weight-bold text-white">
+										Assign myself as the MCP for this patient
+									</a>
+									<form url="/api/client/putMcp" class="mcp-theme-1">
+										<input type="hidden" name="uid" value="{{$patient->uid}}">
+										<input type="hidden" name="mcpProUid" value="{{$pro->uid}}">
+										<p>Are you sure?</p>
+										<div>
+											<button submit class="btn btn-sm btn-primary mr-2">
+												Submit
+											</button>
+											<button cancel class="btn btn-sm btn-default border">
+												Cancel
+											</button>
+										</div>
+									</form>
+								</div>
+							</div>
+						</div>
+					</div>
+				@endif
+				@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $patient->is_mcp_onboarding_active === 'NO')
+					<div class="alert alert-warning mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
+						<div class="font-weight-bold text-dark font-size-16">MCP onboarding is not active for this patient.</div>
+						<div class="text-secondary p-2 border mt-2 bg-light">
+							<div class="font-weight-bold">{{$patient->why_is_mcp_onboarding_not_active_category}}</div>
+							<div>{{$patient->why_is_mcp_onboarding_not_active_memo}}</div>
+						</div>
+					</div>
+				@endif
+				<div class="card mt-3" id="patient-header">
+					<div class="card-header py-1 hide-inside-ticket-popup">
+						<?php
+						$thumbnail = $patient->profile_picture_base64;
+						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
+						$online = $patient->is_online ? 'online' : '';
+						$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
 
-                        $confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
-                        $confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
+						$confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
+						$confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
 
-                        $location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
-                        $location = empty($location) ? '-' : $location;
+						$location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
+						$location = empty($location) ? '-' : $location;
 
-                        $mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
-                        $cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
+						$mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
+						$cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
 
-                        $memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
-                        if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
-                        else if ($memberSince > 1) $memberSince .= ' days ago';
-                        else if ($memberSince === 1) $memberSince = 'yesterday';
-                        else if ($memberSince === 0) $memberSince = 'today';
-                        ?>
+						$memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
+						if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
+						else if ($memberSince > 1) $memberSince .= ' days ago';
+						else if ($memberSince === 1) $memberSince = 'yesterday';
+						else if ($memberSince === 0) $memberSince = 'today';
+						?>
 
-                        <div class=z>
-                            <div class=header>
-                                @if($patient->is_duplicate)
-                                    <div class="alert alert-secondary border-dark mcp-theme-1">
-                                        <span class="text-dark">This chart is a duplicate of&nbsp;</span>
-                                        <a class="font-weight-bold"
-                                           href="/patients/view/{{ $patient->duplicateOf->uid }}">
-                                            {{ $patient->duplicateOf->displayName() }}
-                                        </a>
-                                    </div>
-                                @endif
-                                <div class=hbox>
-                                    <div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
-                                         data-patient-uid="{{$patient->uid}}"
-                                         style="background-image:<?=$thumbnail?>"><?=$initials?></div>
-                                    {{--<div>
-                                        <div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
-                                            <i class="fa fa-microphone"></i>
-                                        </div>
-                                        <div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
-                                            <i class="fa fa-video"></i>
-                                        </div>
-                                    </div>--}}
-                                    <section>
-                                        <div class=hbox>
-                                            <h4>{{$patientName}}</h4>
-                                            <i class=chart>[#{{$patient->chart_number}}]</i>
-                                        </div>
-                                        <div class=separators>
-                                            <div>{{friendly_date_time($patient->dob, false,null, true)}}({{$patient->age_in_years}}
-                                                y.o {{$patient->sex}})
-                                            </div>
-                                            <div>
-                                                <?php
-                                                $coverageStatus = $patient->getPrimaryCoverageStatus();
-                                                $coverage = $patient->getPrimaryCoverage();
-                                                ?>
-                                                @if($coverageStatus === 'YES')
-                                                    Covered <i class="fa fa-check-circle text-success"></i>
-                                                @elseif($coverageStatus === 'NO')
-                                                    Not Covered <i class="fa fa-times text-danger"></i>
-                                                @else
-                                                    Unknown <i
-                                                            class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                                                @endif
-                                                @if($coverage)
-                                                    &nbsp;
-                                                    {{$coverage->toString()}}
-                                                @endif
+						<div class=z>
+							<div class=header>
+								@if($patient->is_duplicate)
+									<div class="alert alert-secondary border-dark mcp-theme-1">
+										<span class="text-dark">This chart is a duplicate of&nbsp;</span>
+										<a class="font-weight-bold"
+										   href="/patients/view/{{ $patient->duplicateOf->uid }}">
+											{{ $patient->duplicateOf->displayName() }}
+										</a>
+									</div>
+								@endif
+								<div class=hbox>
+									<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
+										 data-patient-uid="{{$patient->uid}}"
+										 style="background-image:<?=$thumbnail?>"><?=$initials?></div>
+									{{--<div>
+										<div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
+											<i class="fa fa-microphone"></i>
+										</div>
+										<div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
+											<i class="fa fa-video"></i>
+										</div>
+									</div>--}}
+									<section>
+										<div class=hbox>
+											<h4>{{$patientName}}</h4>
+											<i class=chart>[#{{$patient->chart_number}}]</i>
+										</div>
+										<div class=separators>
+											<div>{{friendly_date_time($patient->dob, false,null, true)}}({{$patient->age_in_years}}
+												y.o {{$patient->sex}})
+											</div>
+											<div>
                                                 @if($pro->pro_type === 'ADMIN')
-                                                    &nbsp;
-                                                    <a href="{{route('patients.view.client-primary-coverages', ['patient' => $patient])}}">View</a>
+                                                    @include('app.patient.coverage-status')
                                                 @endif
-                                            </div>
-                                        </div>
-                                        <div class="screen-only">
-                                        <div class=separators>
-                                            <div>Joined <?=$memberSince?></div>
-                                            <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"></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"></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>
+										<div class="screen-only">
+										<div class=separators>
+											<div>Joined <?=$memberSince?></div>
+											<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"></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"></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
-                                            </div>
-                                        </div>
-                                        <div>
-                                            @if($patient->has_mcp_done_onboarding_visit !== 'YES')
-                                                <span class="text-dark d-inline-flex align-items-center">
-                                                    <span class="mr-2">
-                                                        <i class="fa fa-exclamation-triangle"></i>
-                                                        MCP Onboarding Visit Pending
-                                                    </span>
-                                                </span>
-                                                <span moe class="hide-inside-popup">
-                                                    <a start show><i class="fa fa-edit"></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->title}} ({{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>
-                                                        MCP Onboarding Visit Completed
-                                                    </span>
-                                                </span>
-                                            @endif
-                                        </div>
-                                        <div>
-                                            <label>Physician:</label> {{$patient->pcp ? $patient->pcp->displayName() : '-' }}
-                                            @if($pro->pro_type == 'ADMIN')
-                                                <div moe class="ml-2 hide-inside-popup">
-                                                    <a start show><i class="fa fa-edit"></i></a>
-                                                    <form url="/api/client/putPhysicianPro" class="mcp-theme-1">
-                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <div class="mb-2">
-                                                            <label class="text-secondary text-sm">Physician Pro</label>
-                                                            <select provider-search data-pro-uid="{{ @$patient->pcp->uid }}"
-                                                                    name="physicianProUid"
-                                                                    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/removePhysicianPro" class="mcp-theme-1">
-                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <div class="mb-2">
-                                                            <label class="text-secondary text-sm">Remove Physician 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
+											</div>
+										</div>
+										<div>
+											@if($patient->has_mcp_done_onboarding_visit !== 'YES')
+												<span class="text-dark d-inline-flex align-items-center">
+													<span class="mr-2">
+														<i class="fa fa-exclamation-triangle"></i>
+														MCP Onboarding Visit Pending
+													</span>
+												</span>
+												<span moe class="hide-inside-popup">
+													<a start show><i class="fa fa-edit"></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->title}} ({{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>
+														MCP Onboarding Visit Completed
+													</span>
+												</span>
+											@endif
+										</div>
+										<div>
+											<label>Physician:</label> {{$patient->pcp ? $patient->pcp->displayName() : '-' }}
+											@if($pro->pro_type == 'ADMIN')
+												<div moe class="ml-2 hide-inside-popup">
+													<a start show><i class="fa fa-edit"></i></a>
+													<form url="/api/client/putPhysicianPro" class="mcp-theme-1">
+														<input type="hidden" name="uid" value="{{$patient->uid}}">
+														<div class="mb-2">
+															<label class="text-secondary text-sm">Physician Pro</label>
+															<select provider-search data-pro-uid="{{ @$patient->pcp->uid }}"
+																	name="physicianProUid"
+																	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/removePhysicianPro" class="mcp-theme-1">
+														<input type="hidden" name="uid" value="{{$patient->uid}}">
+														<div class="mb-2">
+															<label class="text-secondary text-sm">Remove Physician 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
-                                        </div>
-                                        <div>
-                                            <label>Nurse:</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"></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">Nurse Pro</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) <?php continue; ?>
-                                                                    <option
-                                                                        value="{{$iPro->uid}}" {{ $patient->defaultNaPro && $iPro->uid === $patient->defaultNaPro->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->defaultNaPro)
-                                                    <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 Nurse 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
+										</div>
+										<div>
+											<label>Nurse:</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"></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">Nurse Pro</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) <?php continue; ?>
+																	<option
+																		value="{{$iPro->uid}}" {{ $patient->defaultNaPro && $iPro->uid === $patient->defaultNaPro->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->defaultNaPro)
+													<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 Nurse 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
-                                        </div>
-                                        </div>
-                                    </section>
-                                    {{--<section>
-                                        <div>
-                                            <label>Next Appt:</label>
-                                            <?php
-                                            $nextAppointment = $patient->nextMcpAppointment();
-                                            $startTime = false;
-                                            $endTime = false;
-                                            if($nextAppointment) {
-                                                $startTime = date('H:i', strtotime($nextAppointment->start_time));
-                                                $endTime = date('H:i', strtotime($nextAppointment->end_time));
-                                                $nextAppointment = date('Y-m-d', strtotime($nextAppointment->start_time));
-                                            }
-                                            ?>
-                                            {{$nextAppointment ? friendly_date_time($nextAppointment . ($startTime ? ' ' . $startTime : ''), true, '') : '-'}}
-                                            <span moe relative class="ml-1">
-                                                <a start show><i class="fa fa-edit"></i></a>
-                                                <form url="/api/appointment/create" class="mcp-theme-1" right>
-                                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                    <input type="hidden" name="title" value="MCP Appointment">
-                                                    <div class="mb-2">
-                                                        <label class="text-secondary text-sm">Pro</label>
-                                                        <select name="proUid" class="form-control form-control-sm">
-                                                            <option value=""> --select-- </option>
-                                                            @foreach($pros as $iPro)
-                                                                <option value="{{$iPro->uid}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                                                            @endforeach
-                                                        </select>
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label class="text-secondary text-sm">Date</label>
-                                                        <input type="date" name="date" min="{{ date('Y-m-d') }}"
-                                                               value="{{ $nextAppointment ? $nextAppointment : date('Y-m-d') }}"
-                                                               class="form-control form-control-sm">
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label class="text-secondary text-sm">Start Time</label>
-                                                        <input type="time" name="startTime" class="form-control form-control-sm"
-                                                               value="{{ $startTime ? $startTime : '' }}">
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label class="text-secondary text-sm">End Time</label>
-                                                        <input type="time" name="endTime" class="form-control form-control-sm"
-                                                               value="{{ $endTime ? $endTime : '' }}">
-                                                    </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>
-                                        </div>
-                                        <div>
-                                            <label>CM:</label> {{ $patient->is_enrolled_in_cm === 'YES' ? 'Yes' : 'No' }}
-                                            <label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
-                                        </div>
-                                    </section>--}}
-                                    <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
-                                        {{--
-                                        <div moe>
-                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
-                                            </button>
-                                            <form url="/api/note/createUsingTemplate"
-                                                  redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
-                                                  class="mcp-theme-1">
-                                                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                @if($pro->is_hcp)
-                                                <input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
-                                                @else
-                                                <input type="hidden" name="naProUid" value="{{$pro->uid}}">
-                                                @endif
-                                                <input type="hidden" name="effectiveDateEST" value="{{date("Y-m-d")}}">
-                                                <input type="hidden" name="effectiveTime" value="{{date("h:i")}}">
-                                                <input type="hidden" name="title" id="note-create-title" value="">
-                                                <div class="form-group mb-2">
-                                                    <label for="" class="text-secondary text-sm mb-1">Note Template *</label>
-                                                    <select name="noteTemplateUid" class="form-control form-control-sm"
-                                                            onchange="$('#note-create-title').val($(this).find('option:selected').text())"
-                                                            required>
-                                                        <option value=""> --select--</option>
-                                                        @foreach($pro->noteTemplates as $noteTemplate)
-                                                            <?php $nT = $noteTemplate->template(); ?>
-                                                            <option value="{{$nT->uid}}">{{$nT->title}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label for="" class="text-secondary text-sm mb-1">Method *</label>
-                                                    <select name="method" class="form-control form-control-sm note-method-select" required>
-                                                        <option value="AUDIO">Audio</option>
-                                                        <option value="VIDEO">Video</option>
-                                                        <option value="IN_CLINIC">In-Clinic</option>
-                                                        <option value="HOUSE_CALL">House Call</option>
-                                                    </select>
-                                                </div>
-                                                <div class="form-group if-in-clinic">
-                                                    <label for="" class="text-secondary text-sm mb-1">Location</label>
-                                                    <select name="hcpCompanyLocationUid" class="form-control">
-                                                        <option value=""></option>
-                                                        @foreach($pro->companyLocations() as $location)
-                                                            <option value="{{$location->uid}}">{{$location->line1}} {{$location->city}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div class="form-group m-0">
-                                                    <button submit class="btn btn-primary btn-sm">submit</button>
-                                                </div>
-                                            </form>
-                                        </div> --}}
-                                        <div>
-                                            <div moe relative>
-                                                <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
-                                                </button>
-                                                <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
-                                                    <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                                                    <div class="mb-2">
-                                                        <label for="" class="text-sm text-secondary mb-1">Cell
-                                                            Number</label>
-                                                        <input type="text" class="form-control form-control-sm"
-                                                               name="cellNumber" value="{{$patient->cell_number}}">
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label for=""
-                                                               class="text-sm text-secondary mb-1">Message</label>
-                                                        <textarea type="text" class="form-control form-control-sm"
-                                                                  name="message"></textarea>
-                                                    </div>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>
-                                                            Cancel
-                                                        </button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                        <div>
-                                        <span moe relative class="">
-                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i
-                                                    class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
-                                            <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right
-                                                  class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                                                <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
-                                                <div class="mb-2">
-                                                    <label for=""
-                                                           class="text-sm text-secondary mb-1">Cell Number</label>
-                                                    <input type="text" class="form-control input-sm" name="cellNumber"
-                                                           value="{{$patient->cell_number}}">
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label for=""
-                                                           class="text-sm text-secondary mb-1">Email address</label>
-                                                    <input type="text" class="form-control input-sm" name="emailAddress"
-                                                           value="{{$patient->email_address}}">
-                                                </div>
-                                                <div class="d-flex align-items-center">
-                                                    <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border"
-                                                            cancel>Cancel</button>
-                                                </div>
-                                            </form>
-                                        </span>
-                                        </div>
-                                    </section>
-                                    <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-1">
-                                        @if($performer->pro->pro_type == 'ADMIN')
-                                        <div>
-                                            <button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
-                                        </div>
-                                        @endif
-                                        <div>
-                                            <button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
-                                        </div>
-                                        {{--
-                                        <div class="">
-                                            @if($pro->isWorkingOnClient($patient))
-                                                <div moe>
-                                                    <form url="/api/proClientWork/KillRunningWorkForSelf"
-                                                          class="mcp-theme-1" show>
-                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <div>
-                                                            <button class="col-2-button" submit><i class="fa fa-stop text-secondary"></i>&nbsp;Work:
-                                                                Stop
-                                                            </button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            @else
-                                                <div moe>
-                                                    <form url="/api/proClientWork/create" class="mcp-theme-1" show>
-                                                        <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                        <div>
-                                                            <button class="col-2-button" submit><i class="fa fa-play text-secondary"></i>&nbsp;Work:
-                                                                Start
-                                                            </button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            @endif
-                                        </div>
-                                        --}}
-                                        <div class="mr-auto">
-                                            @if($pro->isWorkingOnClient($patient))
-                                                <div class="d-flex align-items-center">
-                                                    @if($patient->active_mcp_request_id)
-                                                        {{-- kill mcp request for client --}}
-                                                        <div moe relative class="">
-                                                            <button href="" start show class="col-2-button"><i
-                                                                    class="fa fa-times text-danger"></i>&nbsp;MCP Req.
-                                                            </button>
-                                                            <form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
-                                                                <input type="hidden" name="clientUid"
-                                                                       value="{{$patient->uid}}">
-                                                                <p>Kill the MCP Request for this patient?</p>
-                                                                <div>
-                                                                    <button submit class="btn btn-sm btn-primary mr-2">
-                                                                        Yes
-                                                                    </button>
-                                                                    <button cancel
-                                                                            class="btn btn-sm btn-default border">Cancel
-                                                                    </button>
-                                                                </div>
-                                                            </form>
-                                                        </div>
-                                                    @else
-                                                        {{-- create mcp request for client --}}
-                                                        <div moe relative class="">
-                                                            <button href="" start show class="col-2-button"><i
-                                                                    class="fa fa-plus text-sm text-secondary"></i>&nbsp;MCP
-                                                                Req.
-                                                            </button>
-                                                            <form url="/api/mcpRequest/createAsPro" class="mcp-theme-1"
-                                                                  right>
-                                                                <p>Create an MCP Request for this patient?</p>
-                                                                <div>
-                                                                    <button submit class="btn btn-sm btn-primary mr-2">
-                                                                        Yes
-                                                                    </button>
-                                                                    <button cancel
-                                                                            class="btn btn-sm btn-default border">Cancel
-                                                                    </button>
-                                                                </div>
-                                                            </form>
-                                                        </div>
-                                                    @endif
-                                                </div>
-                                            @endif
-                                        </div>
-                                    </section>
+															</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
+										</div>
+										</div>
+									</section>
+									{{--<section>
+										<div>
+											<label>Next Appt:</label>
+											<?php
+											$nextAppointment = $patient->nextMcpAppointment();
+											$startTime = false;
+											$endTime = false;
+											if($nextAppointment) {
+												$startTime = date('H:i', strtotime($nextAppointment->start_time));
+												$endTime = date('H:i', strtotime($nextAppointment->end_time));
+												$nextAppointment = date('Y-m-d', strtotime($nextAppointment->start_time));
+											}
+											?>
+											{{$nextAppointment ? friendly_date_time($nextAppointment . ($startTime ? ' ' . $startTime : ''), true, '') : '-'}}
+											<span moe relative class="ml-1">
+												<a start show><i class="fa fa-edit"></i></a>
+												<form url="/api/appointment/create" class="mcp-theme-1" right>
+													<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+													<input type="hidden" name="title" value="MCP Appointment">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Pro</label>
+														<select name="proUid" class="form-control form-control-sm">
+															<option value=""> --select-- </option>
+															@foreach($pros as $iPro)
+																<option value="{{$iPro->uid}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+															@endforeach
+														</select>
+													</div>
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Date</label>
+														<input type="date" name="date" min="{{ date('Y-m-d') }}"
+															   value="{{ $nextAppointment ? $nextAppointment : date('Y-m-d') }}"
+															   class="form-control form-control-sm">
+													</div>
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Start Time</label>
+														<input type="time" name="startTime" class="form-control form-control-sm"
+															   value="{{ $startTime ? $startTime : '' }}">
+													</div>
+													<div class="mb-2">
+														<label class="text-secondary text-sm">End Time</label>
+														<input type="time" name="endTime" class="form-control form-control-sm"
+															   value="{{ $endTime ? $endTime : '' }}">
+													</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>
+										</div>
+										<div>
+											<label>CM:</label> {{ $patient->is_enrolled_in_cm === 'YES' ? 'Yes' : 'No' }}
+											<label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
+										</div>
+									</section>--}}
+									<section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
+										{{--
+										<div moe>
+											<button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
+											</button>
+											<form url="/api/note/createUsingTemplate"
+												  redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
+												  class="mcp-theme-1">
+												<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+												@if($pro->is_hcp)
+												<input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
+												@else
+												<input type="hidden" name="naProUid" value="{{$pro->uid}}">
+												@endif
+												<input type="hidden" name="effectiveDateEST" value="{{date("Y-m-d")}}">
+												<input type="hidden" name="effectiveTime" value="{{date("h:i")}}">
+												<input type="hidden" name="title" id="note-create-title" value="">
+												<div class="form-group mb-2">
+													<label for="" class="text-secondary text-sm mb-1">Note Template *</label>
+													<select name="noteTemplateUid" class="form-control form-control-sm"
+															onchange="$('#note-create-title').val($(this).find('option:selected').text())"
+															required>
+														<option value=""> --select--</option>
+														@foreach($pro->noteTemplates as $noteTemplate)
+															<?php $nT = $noteTemplate->template(); ?>
+															<option value="{{$nT->uid}}">{{$nT->title}}</option>
+														@endforeach
+													</select>
+												</div>
+												<div class="mb-2">
+													<label for="" class="text-secondary text-sm mb-1">Method *</label>
+													<select name="method" class="form-control form-control-sm note-method-select" required>
+														<option value="AUDIO">Audio</option>
+														<option value="VIDEO">Video</option>
+														<option value="IN_CLINIC">In-Clinic</option>
+														<option value="HOUSE_CALL">House Call</option>
+													</select>
+												</div>
+												<div class="form-group if-in-clinic">
+													<label for="" class="text-secondary text-sm mb-1">Location</label>
+													<select name="hcpCompanyLocationUid" class="form-control">
+														<option value=""></option>
+														@foreach($pro->companyLocations() as $location)
+															<option value="{{$location->uid}}">{{$location->line1}} {{$location->city}}</option>
+														@endforeach
+													</select>
+												</div>
+												<div class="form-group m-0">
+													<button submit class="btn btn-primary btn-sm">submit</button>
+												</div>
+											</form>
+										</div> --}}
+										<div>
+											<div moe relative>
+												<button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
+												</button>
+												<form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{ $patient->uid }}">
+													<div class="mb-2">
+														<label for="" class="text-sm text-secondary mb-1">Cell
+															Number</label>
+														<input type="text" class="form-control form-control-sm"
+															   name="cellNumber" value="{{$patient->cell_number}}">
+													</div>
+													<div class="mb-2">
+														<label for=""
+															   class="text-sm text-secondary mb-1">Message</label>
+														<textarea type="text" class="form-control form-control-sm"
+																  name="message"></textarea>
+													</div>
+													<div class="d-flex align-items-center">
+														<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+														<button class="btn btn-sm btn-default mr-2 border" cancel>
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+										</div>
+										<div>
+										<span moe relative class="">
+											<button start show title="SMS check-in link to the patient">Send&nbsp;<i
+													class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
+											<form url="/api/client/sendCheckInTokenViaSmsOrEmail" right
+												  class="mcp-theme-1">
+												<input type="hidden" name="uid" value="{{ $patient->uid }}">
+												<p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
+												<div class="mb-2">
+													<label for=""
+														   class="text-sm text-secondary mb-1">Cell Number</label>
+													<input type="text" class="form-control input-sm" name="cellNumber"
+														   value="{{$patient->cell_number}}">
+												</div>
+												<div class="mb-2">
+													<label for=""
+														   class="text-sm text-secondary mb-1">Email address</label>
+													<input type="text" class="form-control input-sm" name="emailAddress"
+														   value="{{$patient->email_address}}">
+												</div>
+												<div class="d-flex align-items-center">
+													<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+													<button class="btn btn-sm btn-default mr-2 border"
+															cancel>Cancel</button>
+												</div>
+											</form>
+										</span>
+										</div>
+									</section>
+									<section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-1">
+										@if($performer->pro->pro_type == 'ADMIN')
+										<div>
+											<button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
+										</div>
+										@endif
+										<div>
+											<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
+										</div>
+										{{--
+										<div class="">
+											@if($pro->isWorkingOnClient($patient))
+												<div moe>
+													<form url="/api/proClientWork/KillRunningWorkForSelf"
+														  class="mcp-theme-1" show>
+														<input type="hidden" name="uid" value="{{$patient->uid}}">
+														<div>
+															<button class="col-2-button" submit><i class="fa fa-stop text-secondary"></i>&nbsp;Work:
+																Stop
+															</button>
+														</div>
+													</form>
+												</div>
+											@else
+												<div moe>
+													<form url="/api/proClientWork/create" class="mcp-theme-1" show>
+														<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+														<div>
+															<button class="col-2-button" submit><i class="fa fa-play text-secondary"></i>&nbsp;Work:
+																Start
+															</button>
+														</div>
+													</form>
+												</div>
+											@endif
+										</div>
+										--}}
+										<div class="mr-auto">
+											@if($pro->isWorkingOnClient($patient))
+												<div class="d-flex align-items-center">
+													@if($patient->active_mcp_request_id)
+														{{-- kill mcp request for client --}}
+														<div moe relative class="">
+															<button href="" start show class="col-2-button"><i
+																	class="fa fa-times text-danger"></i>&nbsp;MCP Req.
+															</button>
+															<form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
+																<input type="hidden" name="clientUid"
+																	   value="{{$patient->uid}}">
+																<p>Kill the MCP Request for this patient?</p>
+																<div>
+																	<button submit class="btn btn-sm btn-primary mr-2">
+																		Yes
+																	</button>
+																	<button cancel
+																			class="btn btn-sm btn-default border">Cancel
+																	</button>
+																</div>
+															</form>
+														</div>
+													@else
+														{{-- create mcp request for client --}}
+														<div moe relative class="">
+															<button href="" start show class="col-2-button"><i
+																	class="fa fa-plus text-sm text-secondary"></i>&nbsp;MCP
+																Req.
+															</button>
+															<form url="/api/mcpRequest/createAsPro" class="mcp-theme-1"
+																  right>
+																<p>Create an MCP Request for this patient?</p>
+																<div>
+																	<button submit class="btn btn-sm btn-primary mr-2">
+																		Yes
+																	</button>
+																	<button cancel
+																			class="btn btn-sm btn-default border">Cancel
+																	</button>
+																</div>
+															</form>
+														</div>
+													@endif
+												</div>
+											@endif
+										</div>
+									</section>
 
-                                    <ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
-                                        <li class="d-flex align-items-start">
-                                            <span class="aligned-icon">
-                                                <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
-                                            </span>
-                                            <div class="position-relative">
-                                                <?php
-                                                $addressParts = [];
-                                                if (!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
-                                                if (!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
-                                                $addressParts = implode(", ", $addressParts) . "<br/>";
-                                                $addressPart2 = [];
-                                                if (!!$patient->mailing_address_city) $addressPart2[] = $patient->mailing_address_city;
-                                                if (!!$patient->mailing_address_state) $addressPart2[] = $patient->mailing_address_state;
-                                                $addressParts .= implode(", ", $addressPart2);
-                                                echo $addressParts;
-                                                ?>
-                                                {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
-                                                @if($patient->mailing_address_memo)
-                                                    <span class="position-relative c-pointer text-center stag-tooltip ml-2">
-                                                        <i class="fa fa-info-circle"></i>
-                                                        <div
-                                                            class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
-                                                            <div class="text-left font-weight-bold pb-1">Special Instructions</div>
-                                                            <div
-                                                                class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
-                                                        </div>
-                                                    </span>
-                                                @endif
-                                            </div>
-                                        </li>
-                                        @if($patient->cell_number)
-                                            <li>
-                                                <span class="aligned-icon">
-                                                    <i class="fa fa-phone-alt" aria-hidden="true"></i>
-                                                </span>
-                                                {{$patient->cell_number}}
-                                                <span class="small text-secondary ml-1">
-                                                    {{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
-                                                </span>
-                                            </li>
-                                        @endif
-                                        @if($patient->phone_home)
-                                            <li>
-                                                <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
-                                                {{$patient->phone_home}}
-                                            </li>
-                                        @endif
-                                        <li class="{{empty($confirmedEmail) || $confirmedEmail === '-' ? 'screen-only' : ''}}">
-                                            <span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
-                                            {{$confirmedEmail}}
-                                        </li>
-                                        <li class="screen-only hide-inside-popup">
-                                            <span class="aligned-icon text-primary">
-                                                <i class="fa fa-link" aria-hidden="true"></i>
-                                            </span>
-                                            <?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
-                                            <a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
-                                                {{ $numLinkedAccounts === 0 ? 'No' : $numLinkedAccounts }}
-                                                account{{ $numLinkedAccounts === 1 ? '' : 's' }} linked
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div> <!-- z -->
-                    </div>
-                    @if($pro->pro_type === 'ADMIN')
-                        <div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
-                            <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>
-                                    <div moe relative class="ml-2">
-                                        <a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
-                                        <form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
-                                            <input type="hidden" name="uid" value="{{$tag->uid}}">
-                                            <p class="text-nowrap text-dark">Cancel this tag?</p>
-                                            <div>
-                                                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @endforeach
-                            <div moe relative class="ml-2">
-                                <a href="" start show class="text-sm">+ Add</a>
-                                <form url="/api/clientTag/create" class="mcp-theme-1">
-                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                    <div class="mb-2">
-                                        <label class="text-secondary text-sm">Tag</label>
-                                        <input type="text" class="form-control form-control-sm"
-                                               name="tag"
-                                               placeholder="Tag" required>
-                                    </div>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    @endif
-                    {{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
+									<ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
+										<li class="d-flex align-items-start">
+											<span class="aligned-icon">
+												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>
+											</span>
+											<div class="position-relative">
+												<?php
+												$addressParts = [];
+												if (!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
+												if (!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
+												$addressParts = implode(", ", $addressParts) . "<br/>";
+												$addressPart2 = [];
+												if (!!$patient->mailing_address_city) $addressPart2[] = $patient->mailing_address_city;
+												if (!!$patient->mailing_address_state) $addressPart2[] = $patient->mailing_address_state;
+												$addressParts .= implode(", ", $addressPart2);
+												echo $addressParts;
+												?>
+												{{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
+												@if($patient->mailing_address_memo)
+													<span class="position-relative c-pointer text-center stag-tooltip ml-2">
+														<i class="fa fa-info-circle"></i>
+														<div
+															class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+															<div class="text-left font-weight-bold pb-1">Special Instructions</div>
+															<div
+																class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
+														</div>
+													</span>
+												@endif
+											</div>
+										</li>
+										@if($patient->cell_number)
+											<li>
+												<span class="aligned-icon">
+													<i class="fa fa-phone-alt" aria-hidden="true"></i>
+												</span>
+												{{$patient->cell_number}}
+												<span class="small text-secondary ml-1">
+													{{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
+												</span>
+											</li>
+										@endif
+										@if($patient->phone_home)
+											<li>
+												<span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
+												{{$patient->phone_home}}
+											</li>
+										@endif
+										<li class="{{empty($confirmedEmail) || $confirmedEmail === '-' ? 'screen-only' : ''}}">
+											<span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
+											{{$confirmedEmail}}
+										</li>
+										<li class="screen-only hide-inside-popup">
+											<span class="aligned-icon text-primary">
+												<i class="fa fa-link" aria-hidden="true"></i>
+											</span>
+											<?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
+											<a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
+												{{ $numLinkedAccounts === 0 ? 'No' : $numLinkedAccounts }}
+												account{{ $numLinkedAccounts === 1 ? '' : 's' }} linked
+											</a>
+										</li>
+									</ul>
+								</div>
+							</div>
+						</div> <!-- z -->
+					</div>
+					@if($pro->pro_type === 'ADMIN')
+						<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
+							<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>
+									<div moe relative class="ml-2">
+										<a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
+										<form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
+											<input type="hidden" name="uid" value="{{$tag->uid}}">
+											<p class="text-nowrap text-dark">Cancel this tag?</p>
+											<div>
+												<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+												<button cancel class="btn btn-sm btn-default border">Cancel</button>
+											</div>
+										</form>
+									</div>
+								</div>
+							@endforeach
+							<div moe relative class="ml-2">
+								<a href="" start show class="text-sm">+ Add</a>
+								<form url="/api/clientTag/create" class="mcp-theme-1">
+									<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+									<div class="mb-2">
+										<label class="text-secondary text-sm">Tag</label>
+										<input type="text" class="form-control form-control-sm"
+											   name="tag"
+											   placeholder="Tag" required>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						</div>
+					@endif
+					{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
 
-                        @if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
-                            <div moe relative class="ml-2">
-                                <a href="" start show class="btn btn-sm btn-success text-white font-weight-bold small">Claim as MCP</a>
-                                <form url="/api/mcpRequest/claim" class="mcp-theme-1" right>
-                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                    <p>Claim this patient?</p>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        @endif
-                    </div>--}}
-                    <div class="card-body">
-                        {{--<h1 class="h3">@yield('section-title')</h1>--}}
-                        <div class="mcp-theme-1">
-                            @yield('inner-content')
-                        </div>
-                    </div>
-                </div>
-            </main>
-        </div>
-    </div>
-    <script>
-        (function() {
-            function init() {
-                $('.note-method-select').change(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
+						@if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
+							<div moe relative class="ml-2">
+								<a href="" start show class="btn btn-sm btn-success text-white font-weight-bold small">Claim as MCP</a>
+								<form url="/api/mcpRequest/claim" class="mcp-theme-1" right>
+									<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+									<p>Claim this patient?</p>
+									<div>
+										<button submit class="btn btn-sm btn-primary mr-2">Yes</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						@endif
+					</div>--}}
+					<div class="card-body">
+						{{--<h1 class="h3">@yield('section-title')</h1>--}}
+						<div class="mcp-theme-1">
+							@yield('inner-content')
+						</div>
+					</div>
+				</div>
+			</main>
+		</div>
+	</div>
+	<script>
+		(function() {
+			function init() {
+				$('.note-method-select').change(function() {
+					let form = $(this).closest('form');
+					if(this.value === 'IN_CLINIC') {
+						form.find('.if-in-clinic').show();
+					}
+					else {
+						form.find('.if-in-clinic').hide();
+					}
+				});
 
-                $('.note-method-select').each(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
-            }
-            addMCInitializer('patient-add-note-popup', init, '#patient-header')
-        }).call(window);
-    </script>
-    <script>
-        (function() {
-            function init() {
-                $('#sidebarMenu')
-                    .off('scroll')
-                    .on('scroll', function() {
-                        localStorage.sidebarMenuScrollTop = $(this).scrollTop();
-                    });
-                if(localStorage.sidebarMenuScrollTop) {
-                    $('#sidebarMenu').scrollTop(+localStorage.sidebarMenuScrollTop);
-                }
-            }
-            addMCInitializer('sidebarMenu', init, '#sidebarMenu')
-        }).call(window);
-    </script>
+				$('.note-method-select').each(function() {
+					let form = $(this).closest('form');
+					if(this.value === 'IN_CLINIC') {
+						form.find('.if-in-clinic').show();
+					}
+					else {
+						form.find('.if-in-clinic').hide();
+					}
+				});
+			}
+			addMCInitializer('patient-add-note-popup', init, '#patient-header')
+		}).call(window);
+	</script>
+	<script>
+		(function() {
+			function init() {
+				$('#sidebarMenu')
+					.off('scroll')
+					.on('scroll', function() {
+						localStorage.sidebarMenuScrollTop = $(this).scrollTop();
+					});
+				if(localStorage.sidebarMenuScrollTop) {
+					$('#sidebarMenu').scrollTop(+localStorage.sidebarMenuScrollTop);
+				}
+			}
+			addMCInitializer('sidebarMenu', init, '#sidebarMenu')
+		}).call(window);
+	</script>
 @endsection