Преглед изворни кода

RPM admin - new filters + cols

Vijayakrishnan пре 3 година
родитељ
комит
f26ffa876a

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

@@ -1956,6 +1956,24 @@ WHERE
             $conditions[] = "(client.is_enrolled_in_rm = 'YES')";
         }
 
+        if($request->input('f_claim_closed')) {
+            if($request->input('f_claim_closed') === 'no') {
+                $conditions[] = "(care_month.is_claim_closed IS NULL OR care_month.is_claim_closed IS FALSE)";
+            }
+            else {
+                $conditions[] = "(care_month.is_claim_closed IS TRUE)";
+            }
+        }
+
+        if($request->input('f_visit_90_days')) {
+            /*if($request->input('f_visit_90_days') === 'yes') {
+                $conditions[] = "(care_month.is_claim_closed IS " . ($request->input('f_claim_closed') === 'yes' ? 'TRUE' : 'FALSE') . ")";
+            }
+            else {
+                $conditions[] = "(care_month.is_claim_closed IS " . ($request->input('f_claim_closed') === 'yes' ? 'TRUE' : 'FALSE') . ")";
+            }*/
+        }
+
         $genericBillIdColumns = "care_month.mcp_rm_generic_bill_id,
                    mcpBill.uid as mcp_rm_generic_bill_uid,
                    mcpBill.generic_pro_id as mcp_rm_generic_bill_generic_pro_id,
@@ -2005,9 +2023,11 @@ SELECT client.name_first, client.name_last,
        client.cell_number,
        client.is_assigned_cellular_bp_device,
        client.is_assigned_cellular_weight_scale_device,
+       nv.raw_date as next_visit_date,
        DATE_PART('day', NOW() - client.most_recent_cellular_measurement_at) as dslm,
        care_month.uid as care_month_uid,
        care_month.id as care_month_id,
+       care_month.is_claim_closed,
        care_month.start_date,
        care_month.rm_total_time_in_seconds_by_mcp,
        care_month.rm_total_time_in_seconds_by_rmm_pro,
@@ -2047,11 +2067,12 @@ SELECT client.name_first, client.name_last,
        (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}
 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
+    left join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
     left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
     left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id
     left join client_primary_coverage cpc on client.effective_client_primary_coverage_id = cpc.id
     left join payer on cpc.commercial_payer_id = payer.id
+    left join appointment nv on nv.id = mrnote.follow_up_appointment_id
     {$genericBillJoinClause}
 WHERE
       EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "

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

@@ -14,7 +14,6 @@
     <td>{{$iPatient->payer_name}}</td>
     <td>{{$iPatient->mailing_address_state}}</td>
     <td>{{$iPatient->mcp_name}}</td>
-    <td>{{$iPatient->age_in_years}}</td>
     <td>
         @if($iPatient->is_assigned_cellular_bp_device)
             <div class="d-flex align-items-baseline">
@@ -61,6 +60,10 @@
         </div>
     </td>
 
+    <td>
+        {{$iPatient->next_visit_date ?: '-'}}
+    </td>
+
     <td>
         <div class="d-flex align-items-baseline">
             <i class="mr-1 text-sm fa {{$iPatient->has_mcp_interacted_with_client_about_rm ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>

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

@@ -29,12 +29,12 @@
                 <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>--}}
                 <th class="border-0 text-secondary">BP</th>
                 <th class="border-0 text-secondary">Scale</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DSLM', 'key' => 'dslm'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DSLV', 'key' => 'most_recent_completed_mcp_note_date'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Next<br>Visit', 'key' => 'next_visit_date'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '<i class="text-sm fa fa-phone rotateh"></i> MCP', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '<i class="text-sm fa fa-phone rotateh"></i> Any', 'key' => 'has_anyone_interacted_with_client_about_rm'])</th>
                 <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#Meas.<br>Days', 'key' => 'number_of_days_with_remote_measurements'])</th>

+ 24 - 0
resources/views/app/practice-management/rpm-matrix-for-admin.blade.php

@@ -199,6 +199,18 @@
                             </div>
                         </div>
 
+                        <div class="max-width-110px">
+                            <label class="mb-0 text-sm {{request()->input('f_claim_closed') ? 'font-weight-bold text-info' : 'text-secondary'}}">Claim Closed</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_claim_closed"
+                                        class="mr-1 form-control form-control-sm min-width-unset pl-0">
+                                    <option value="">All</option>
+                                    <option {{request()->input('f_claim_closed') === 'yes' ? 'selected' : ''}} value="yes">Closed</option>
+                                    <option {{request()->input('f_claim_closed') === 'no' ? 'selected' : ''}} value="no">Not Closed</option>
+                                </select>
+                            </div>
+                        </div>
+
                     </div>
 
                     <div class="d-flex align-items-start mt-2">
@@ -328,6 +340,18 @@
                             </div>
                         </div>
 
+                        <!--<div class="max-width-110px">
+                            <label class="mb-0 text-sm {{request()->input('f_visit_90_days') ? 'font-weight-bold text-info' : 'text-secondary'}}">Visit 90 Days</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_visit_90_days"
+                                        class="mr-2 form-control form-control-sm min-width-unset pl-0">
+                                    <option value="">All</option>
+                                    <option {{request()->input('f_visit_90_days') === 'yes' ? 'selected' : ''}} value="yes">Closed</option>
+                                    <option {{request()->input('f_visit_90_days') === 'no' ? 'selected' : ''}} value="no">Not Closed</option>
+                                </select>
+                            </div>
+                        </div>-->
+
                         <div>
                             <label class="mb-0 text-sm text-secondary">&nbsp;</label>
                             <div class="d-flex align-items-start">