Răsfoiți Sursa

server changes

root 3 ani în urmă
părinte
comite
4b7075ed0b

+ 4 - 1
app/Http/Controllers/PracticeManagementController.php

@@ -1614,8 +1614,11 @@ SELECT client.name_first, client.name_last,
        care_month.most_recent_cellular_bp_measurement_at,      
        care_month.most_recent_cellular_weight_value,
        care_month.most_recent_cellular_weight_measurement_at,
+
+	mcp.name_last || ', ' || mcp.name_last AS mcp_name,
+	
        {$genericBillIdColumns}
-FROM care_month join client on care_month.client_id = client.id join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
+FROM care_month join client on care_month.client_id = client.id left join pro AS mcp on care_month.mcp_pro_id = mcp.id join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
     {$genericBillJoinClause}
     left join note mrmnote on mrmnote.id = (
         select max(n.id) from note n 

+ 1 - 1
resources/views/app/practice-management/remote-monitoring-row-for-admin.blade.php

@@ -15,4 +15,4 @@ if($iPatient->most_recent_completed_mcp_note_date) {
 $lastVisitWithin90Days = ($daysDiff !== -1 && $daysDiff <= 90);
 
 ?>
-@include('app.practice-management.remote-monitoring-row-markup-for-admin')
+@include('app.practice-management.remote-monitoring-row-markup-for-admin')

+ 3 - 1
resources/views/app/practice-management/remote-monitoring-row-markup-for-admin.blade.php

@@ -1,4 +1,6 @@
 <tr data-client-uid="{{$iPatient->client_uid}}" data-care-month-uid="{{$iPatient->care_month_uid}}">
+    <td>{{ $trIndex + 1 }}</td>
+    <td>{{ @$iPatient->mcp_name }}</td>
     <td class="pl-2">
         <a href="/patients/view/{{ $iPatient->client_uid }}/care-months/view/{{$iPatient->care_month_uid}}"
            native target="_blank"
@@ -111,4 +113,4 @@
             </span>
         @endif
     </td>
-</tr>
+</tr>

+ 3 - 2
resources/views/app/practice-management/rpm-matrix-for-admin-table.blade.php

@@ -15,7 +15,8 @@
         <table class="table table-sm table-striped table-hover p-0 m-0 min-width-1100px" id="table-rm-matrix">
             <thead class="bg-light">
             <tr>
-
+		<th></th>
+		<th>CM MCP</th>
                 <th class="border-0 pl-2">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Name', 'key' => 'client_name'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DOB', 'key' => 'dob'])</th>
                 {{--<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'RPM?', 'key' => 'is_enrolled_in_rm'])</th>--}}
@@ -62,4 +63,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>