RPM admin - insurance and state sort fix

app/Http/Controllers/PracticeManagementController.php

@@ -2032,7 +2032,10 @@ SELECT client.name_first, client.name_last,
        care_month.most_recent_cellular_weight_measurement_at,
        cpc.plan_type,
        cpc.auto_medicare_is_partbprimary,
-       payer.name as payer_name,
+       (CASE 
+           WHEN cpc.plan_type LIKE 'COMMERCIAL' THEN payer.name
+           ELSE cpc.plan_type
+       END) as payer_name,
        (SELECT COUNT(*) FROM claim_line where claim_line.cpt = '99454' AND claim_line.claim_id IN (SELECT claim.id FROM claim WHERE claim.care_month_id = care_month.id AND claim.status != 'CANCELLED')) as claim_454,
        (SELECT COUNT(*) FROM claim_line where claim_line.cpt = '99457' AND claim_line.claim_id IN (SELECT claim.id FROM claim WHERE claim.care_month_id = care_month.id AND claim.status != 'CANCELLED')) as claim_457,
        {$genericBillIdColumns}

resources/views/app/practice-management/_sort_header_multi.blade.php

@@ -7,7 +7,7 @@ $targetSortParamForInclusionOrReversal = json_encode(includeOrReverseInMultiSort
 $targetSortParamForRemoval = json_encode(removeFromMultiSort($current, $key));
 ?>
 <div class="d-flex align-items-end flex-wrap">
-    <a href="{{ $route }}?{{queryLineExcept(['sort_by'])}}&sort_by={!! urlencode($targetSortParamForInclusionOrReversal) !!}" class="text-decoration-none">
+    <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'page'])}}&sort_by={!! urlencode($targetSortParamForInclusionOrReversal) !!}" class="text-decoration-none">
         <b class="{{$currentSortForKey ? 'text-primary' : 'text-secondary'}}">{!! $label !!}</b>
         <span class="ml-1 d-inline-flex align-items-baseline position-relative sort-header-arrows" @if($currentSortForKey) sort-index="{{$currentSortForKey['index']}}" @endif>
             <i class="text-sm fa fa-chevron-up {{$currentSortForKey && $currentSortForKey['order'] === 'DESC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
@@ -15,7 +15,7 @@ $targetSortParamForRemoval = json_encode(removeFromMultiSort($current, $key));
         </span>
     </a>
     @if($currentSortForKey)
-        <a href="{{ $route }}?{{queryLineExcept(['sort_by'])}}&sort_by={!! urlencode($targetSortParamForRemoval) !!}" class="text-sm on-hover-opaque text-secondary ml-1">
+        <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'page'])}}&sort_by={!! urlencode($targetSortParamForRemoval) !!}" class="text-sm on-hover-opaque text-secondary ml-1">
             <i class="fa fa-times"></i>
         </a>
     @endif

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

@@ -11,18 +11,10 @@
            class="text-nowrap d-block max-width-170px overflow-hidden text-ellipsis"
         ><span class="sort-data">{{ $iPatient->client_name }}</span></a>
     </td>
-    <td>
-        @if($iPatient->plan_type === 'MEDICARE')
-            Medicare
-        @elseif($iPatient->plan_type === 'MEDICAID')
-            Medicaid
-        @elseif($iPatient->plan_type === 'COMMERCIAL')
-            {{$iPatient->payer_name}}
-        @endif
+    <td>{{$iPatient->payer_name}}</td>
     <td>{{$iPatient->mailing_address_state}}</td>
     <td>{{$iPatient->mcp_name}}</td>
     <td>{{$iPatient->age_in_years}}</td>
-    {{--<td>{!! $iPatient->is_enrolled_in_rm === 'YES' ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>--}}
     <td>
         @if($iPatient->is_assigned_cellular_bp_device)
             <div class="d-flex align-items-baseline">

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

@@ -26,8 +26,8 @@
             <tr>
 		        <th class="border-0"></th>
                 <th class="border-0 pl-2">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Name', 'key' => 'client_name'])</th>
-                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Insurance', 'key' => 'insurance'])</th>
-                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'State', 'key' => 'state'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Insurance', 'key' => 'payer_name'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'State', 'key' => 'mailing_address_state'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'CM MCP', 'key' => 'mcp_name'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Age', 'key' => 'age_in_years'])</th>
                 {{--<th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'RPM?', 'key' => 'is_enrolled_in_rm'])</th>--}}