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

Client rm status: list filter fixes

Vijayakrishnan Krishnan пре 1 недеља
родитељ
комит
9e86d5454d

+ 11 - 3
app/Http/Controllers/PracticeManagementController.php

@@ -4650,13 +4650,21 @@ ORDER BY c.name_last, c.name_first
         $pro = $this->performer()->pro;
         if($pro->pro_type !== 'ADMIN') {
             if($pro->is_hcp){
-               $patients = $patients->where('mcp_pro_id', $this->performer()->pro->id);
+                $patients = $patients->where('mcp_pro_id', $this->performer()->pro->id);
             }
             if($pro->is_considered_for_dna){
                 $patients = $patients->where('default_na_pro_id', $this->performer()->pro->id);
-             }
-
+            }
+        }
 
+        if ($request->input('name')) {
+            $name = trim($request->input('name'));
+            if ($name) {
+                $patients = $patients->where(function ($q) use ($name) {
+                    $q->where('name_first', 'ILIKE', '%' . $name . '%')
+                    ->orWhere('name_last', 'ILIKE', '%' . $name . '%');
+                });
+            }
         }
 
         // filters

+ 1 - 1
resources/views/app/admin/client_ccm_rm_status_filters.blade.php

@@ -185,7 +185,7 @@
 			<label>&nbsp;</label>
 			<div class=" d-flex">
 				<button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
-				<a href="#" v-on:click.prevent="fastLoad('{{route('mcp.patients')}}')" class="btn btn-link btn-sm text-secondary">Clear Filters</a>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('practice-management.client-ccm-rm-status')}}')" class="btn btn-link btn-sm text-secondary">Clear Filters</a>
 			</div>
 		</div>
 	</div>

+ 2 - 0
resources/views/app/patient/coverage_column_fast_renderer.blade.php

@@ -35,6 +35,8 @@
                 <span class="{{ @$truncateName ? 'coverage-payer-name':'' }}"
                       title="{{$patient->insuranceDisplayName()}}">{{$patient->insuranceDisplayName()}}</span>
             @endif
+        @elseif(!!$patient->plan_type)
+            <span class="coverage-payer-name" title="{{$patient->plan_type}}">{{$patient->plan_type}}</span>
         @endif
         <div class="">
             @if($patient->plan_type === 'MEDICARE' && @$patient->mpb_remaining)