Browse Source

Note HCP name_display issue fix

Vijayakrishnan 3 years ago
parent
commit
850c1b885e

+ 6 - 1
resources/views/app/patient/note/dashboard.blade.php

@@ -249,7 +249,7 @@
 
 
             <div class="px-2 border-right">
             <div class="px-2 border-right">
                 <div class="d-flex">
                 <div class="d-flex">
-                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
+                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->displayName()}}</span>
                     @if($pro->pro_type === 'ADMIN')
                     @if($pro->pro_type === 'ADMIN')
                     <div moe class="ml-2">
                     <div moe class="ml-2">
                         <a href="" show start><i class="fa fa-edit"></i></a>
                         <a href="" show start><i class="fa fa-edit"></i></a>
@@ -2412,6 +2412,11 @@
                             <span>Handouts</span>
                             <span>Handouts</span>
                         </div>
                         </div>
                     </div>
                     </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <a native="" target="_top"
+                           class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                           data-non-segment-target="Prescriptions" href="#">ERx</a>
+                    </div>
                     @if($pro->pro_type === 'ADMIN')
                     @if($pro->pro_type === 'ADMIN')
                         <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
                         <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
                             <a native="" target="_top"
                             <a native="" target="_top"

+ 2 - 2
resources/views/app/patient/notes.blade.php

@@ -207,11 +207,11 @@
                     </td>
                     </td>
                 @endif
                 @endif
                 <td>
                 <td>
-                    {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
+                    {{$note->hcpPro ? $note->hcpPro->displayName(): '-'}}
                 </td>
                 </td>
                 @if($pro->pro_type == 'ADMIN')
                 @if($pro->pro_type == 'ADMIN')
                 <td>
                 <td>
-                    {{$note->allyPro ? $note->allyPro->name_display: '-'}}
+                    {{$note->allyPro ? $note->allyPro->displayName(): '-'}}
                 </td>
                 </td>
                 @endif
                 @endif
                 <td>
                 <td>