fixed rpm table

app/Http/Controllers/PracticeManagementController.php

@@ -1573,7 +1573,13 @@ WHERE care_month.uid = '{$careMonthUid}' AND client.uid = '{$clientUid}'
                 $genericBillJoinClause = 'left join bill on care_month.rmm_rm_generic_bill_id = bill.id';
                 break;
             case 'rme':
-                $proTypeCondition = "left join bill on care_month.rme_pro_id = {$performer->pro->id}";
+                $proTypeCondition = "care_month.rmm_pro_id = {$performer->pro->id}";
+                $genericBillIdColumns = "care_month.rmm_rm_generic_bill_id,
+                   bill.uid as rmm_rm_generic_bill_uid,
+                   bill.generic_pro_id as rmm_rm_generic_bill_generic_pro_id,
+                   bill.generic_pro_expected_payment_amount as rmm_rm_generic_bill_expected_payment_amount,
+                   bill.is_signed_by_generic_pro as rmm_rm_generic_bill_signed";
+                $genericBillJoinClause = 'left join bill on care_month.rmm_rm_generic_bill_id = bill.id';
                 break;
         }
 

resources/views/app/practice-management/rpm-matrix-by-pro-type-table.blade.php

@@ -31,7 +31,6 @@
                                 <th class="border-0">Interacted?</th>
                                 <th class="border-0">#Meas. Days</th>
                                 <th class="border-0">#Unstamped</th>
-                                <th class="border-0 {{$strategy === 'X16_DAYS_20_MINS_ON_OWN_MCP_COM_DURING_CM' ? '' : 'd-nonex'}}">#RPM Mins.</th>
                                 <th class="border-0">Billable</th>-->
 
                 <th class="border-0 pl-2">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => 'Name', 'key' => 'client_name'])</th>