update

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

@@ -472,7 +472,7 @@ $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_f
                             <form url="/api/client/putRdPro" class="mcp-theme-1">
                                 <input type="hidden" name="uid" value="{{$patient->uid}}">
                                 <div class="mb-2">
-                                    <label class="mb-1 text-secondary text-sm">RME Pro</label>
+                                    <label class="mb-1 text-secondary text-sm">RD Pro</label>
                                     <select class="form-control form-control-sm" name="rdProUid" provider-search provider-type="rd">
                                         <option value="">--select--</option>
                                     </select>
@@ -922,7 +922,7 @@ $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_f
                                     <form url="/api/client/put2022AwvStatus" class="mcp-theme-1">
                                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                                         <div class="mb-2">
-                                            <label class="mb-1 text-secondary text-sm">2022 AWV Claim</label>
+                                            <label class="mb-1 text-secondary text-sm">2022 AWV Status</label>
                                             <input type="text" class="form-control form-control-sm" name="put2022AwvStatus" />
                                         </div>
                                         <div>

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

@@ -46,7 +46,7 @@ $addressParts .= implode(", ", $addressPart2);
 </style>
 <div class="px-2 pb-2 mcp-theme-1 patient-header">
     @if($pro->pro_type !== 'ADMIN')
-        <?php 
+        <?php
             $showNotYourPatientAlert = false;
             if($pro->is_hcp && $patient->mcp_pro_id != $pro->id){
                 $showNotYourPatientAlert = true;
@@ -54,7 +54,7 @@ $addressParts .= implode(", ", $addressPart2);
             if($pro->profession_mode == 'NHCP' && $patient->default_na_pro_id != $pro->id){
                 $showNotYourPatientAlert = true;
             }
-                
+
             ?>
         @if($showNotYourPatientAlert)
         <div class="alert alert-danger p-1 rounded-0 mb-0">
@@ -292,7 +292,9 @@ $addressParts .= implode(", ", $addressPart2);
                         @endif
                     </div>
                     <div>
+                        @if($patient->defaultNaPro || $pro->pro_type == 'ADMIN')
                         <label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
+                        @endif
                         @if($pro->pro_type == 'ADMIN')
                             <div moe class="ml-2 hide-inside-popup">
                                 <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
@@ -341,6 +343,36 @@ $addressParts .= implode(", ", $addressPart2);
                             </form>
                         @endif
                     </div>
+                    @if($patient->rd || $pro->pro_type == 'ADMIN')
+                    <div class="mb-1">
+                        RD: <b>{{ $patient->rd ? $patient->rd->displayName() : '-'}}</b>
+                        @if($pro->pro_type === 'ADMIN')
+                        <div moe class="ml-2 hide-inside-popup">
+                            <a start show><i class="fa fa-edit on-hover-opaque text-sm"></i></a>
+                            <form url="/api/client/putRdPro" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <label class="mb-1 text-secondary text-sm">RD Pro</label>
+                                    <select class="form-control form-control-sm" name="rdProUid" provider-search provider-type="rd">
+                                        <option value="">--select--</option>
+                                    </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->rd)
+                          <form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->rd->uid}}';" method="POST" target="_top" class="d-inline-block">
+                            @csrf
+                            <input type="hidden" name="proUid" value="{{$patient->rd->uid}}">
+                            <button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user on-hover-opaque"></i></button>
+                          </form>
+                          @endif
+                        @endif
+                    </div>
+                    @endif
                     <div class="d-flex">
                         <div>
                             <span>Status:</span>