Merge branch 'cm-tiers' of https://rav.triplestart.com/tigerphp/stagfe2 into cm-tiers

resources/views/app/dashboard-mcp.blade.php

@@ -311,7 +311,7 @@
                                 </tr>
                                 </tbody>
                             </table>
-                        </div>                        
+                        </div>
                     </div>
                     <div class="card mb-4" stag-collapsible-card="mcp-practice-management" collapsed>
                         <div class="card-header pl-2">
@@ -442,7 +442,7 @@
                                 </div>
                             </div>
 
-                            <div>
+                            <div class="d-none">
                                 @include('app.mcp.dashboard.caremonth-tiers-list')
                             </div>
 

resources/views/app/practice-management/remote-monitoring-row-markup-by-pro-type.blade.php

@@ -38,7 +38,7 @@
             @endif
         </div>
     </td>
-    
+
     <td>
         <div class="d-flex align-items-baseline">
             <i class="mr-1 text-sm fa {{$lastVisitWithinDays ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
@@ -193,10 +193,10 @@
     @if(!request()->input('not-enrolled'))
     <td>
         @if($mode === 'mcp')
+            @php
+              $careMonth = \App\Models\CareMonth::where('uid', $iPatient->care_month_uid)->first();
+            @endphp
             @if($lastVisitWithinDays && $iPatient->has_mcp_interacted_with_client_about_rm && $iPatient->number_of_days_with_remote_measurements >= 16 && $iPatient->rm_total_time_in_seconds_by_mcp >= 1200)
-                @php
-                    $careMonth = \App\Models\CareMonth::where('uid', $iPatient->care_month_uid)->first();
-                @endphp
                 @if($careMonth->mcpRmGenericBill == null )
 
                     @php
@@ -204,7 +204,7 @@
                     @endphp
 
                     @if(!$rpmBillability['billable'])
-                        <div class="alert alert-info m-0">{{$rpmBillability['reason']}}</div>
+                        <div class="alert alert-info m-0 p-1">{{$rpmBillability['reason']}}</div>
                     @else
                         <div moe relative class="d-inline-block">
                             <a class="font-weight-normal" href="" show start>Bill ${{$rpmBillability['amount']}}</a>
@@ -243,8 +243,10 @@
                 <span class="text-danger font-weight-normal">
                     No
                 </span>
+                @include('app.patient.care-month.partials.tier-explainer', ['careMonth' => $careMonth])
             @endif
-        @elseif($mode === 'rmm')
+        @endif
+        @if($mode === 'rmm' && false)
             @if($lastVisitWithinDays && $iPatient->has_mcp_interacted_with_client_about_rm && $iPatient->number_of_days_with_remote_measurements >= 16 && $iPatient->rm_total_time_in_seconds_by_rmm_pro >= 1200)
                 <span class="text-success font-weight-bold">
                     <i class="fa fa-check"></i>
@@ -289,7 +291,7 @@
                     No
                 </span>
             @endif
-        @elseif($mode === 'rme')
+        @elseif($mode === 'rme' && false)
             @if($lastVisitWithinDays && $iPatient->number_of_days_with_remote_measurements >= 16)
                 <span class="text-success font-weight-bold">
                     <i class="fa fa-check"></i>
@@ -303,4 +305,4 @@
         @endif
     </td>
     @endif
-</tr>
+</tr>

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

@@ -28,9 +28,7 @@
                 <th class="border-0 text-secondary">Latest Wt</th>
                 <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => 'Days Since Last Visit', 'key' => 'days_between_most_recent_mcp_note_date_and_end_of_care_month'])</th>
                 @if($mode === 'mcp' || $mode === 'rmm')
-                    @if($strategy === 'X16_DAYS_20_MINS_ON_OWN_MCP_COM_DURING_CM')
-                        <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => 'Interacted?', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
-                    @endif
+                    <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => 'Interacted?', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
                     <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => '#Meas. Days', 'key' => 'number_of_days_with_remote_measurements'])</th>
                     @if($mode === 'mcp')
                         <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => '#MCP Mins.', 'key' => 'rm_total_time_in_seconds_by_mcp'])</th>
@@ -77,4 +75,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>

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

@@ -6,10 +6,10 @@
         function strategy_display($_strategy, $_mode)
         {
             switch ($_strategy) {
+                case 'X7_DAYS_10_MINS_ON_OWN_MCP_COM_DURING_CM':
+                    return '7 meas. days + 10 mins + inter. done during the caremonth';
                 case 'X16_DAYS_20_MINS_ON_OWN_MCP_COM_DURING_CM':
-                    return '16 meas. days + 20 mins + comm. done during the caremonth';
-                case 'X16_DAYS':
-                    return '16 meas. days';
+                    return '16 meas. days + 20 mins + inter. done during the caremonth';
                 default:
                     return '-';
             }
@@ -67,17 +67,22 @@
                            title="RPM Work Matrix">
                             RPM Work Matrix
                         </a>--}}
-                        <span class="ml-3 mr-1 text-secondary">Strategy:</span>
-                        @if($mode === 'mcp')
-                            {{strategy_display($pro->mcp_rpm_payment_strategy, $mode)}}
-                            <?php $strategy = $pro->mcp_rpm_payment_strategy; ?>
-                        @elseif($mode === 'rmm')
-                            {{strategy_display($pro->rme_payment_strategy, $mode)}}
-                            <?php $strategy = $pro->rmm_payment_strategy; ?>
-                        @elseif($mode === 'rmm')
-                            {{strategy_display($pro->rmm_payment_strategy, $mode)}}
-                            <?php $strategy = $pro->rme_payment_strategy; ?>
-                        @endif
+                        <div class="">
+                          <div class="">
+                            <span class="ml-3 mr-1 text-secondary">Goal:</span>
+                            @if($mode === 'mcp')
+                            {{strategy_display($pro->mcp_rpm_payment_strategy_tier_one, $mode)}} <span class="text-muted">({{$pro->mcp_rpm_payment_amount_tier_one ?? '-'}} per patient)</span>
+                            <?php $strategy = $pro->mcp_rpm_payment_strategy_tier_one; ?>
+                            @endif
+                          </div>
+                          <div class="">
+                            <span class="ml-3 mr-1 text-secondary">Partial:</span>
+                            @if($mode === 'mcp')
+                            {{strategy_display($pro->mcp_rpm_payment_strategy_tier_two, $mode)}} <span class="text-muted">({{$pro->mcp_rpm_payment_amount_tier_two ?? '-'}} per patient)</span>
+                            <?php $strategy = $pro->mcp_rpm_payment_strategy_tier_two; ?>
+                            @endif
+                          </div>
+                        </div>
 
                         <div class="ml-auto d-inline-flex flex-nowrap align-items-baseline">
                             <span class="mr-2">Month</span>