Sfoglia il codice sorgente

fixed searching with chart number

= 3 anni fa
parent
commit
b37cf3242a

+ 2 - 6
app/Http/Controllers/AdminController.php

@@ -103,12 +103,8 @@ class AdminController extends Controller
             }
         }
 
-        if ($request->input('chart_number_ends_with')) {
-            if($request->input('chart_number_ends_with') == 'ZERO'){
-                $patients = $patients->where('chart_number', 'ILIKE' , '%0');
-            }else{
-                $patients = $patients->where('chart_number', 'ILIKE' , '%'.$request->input('chart_number_ends_with'));
-            }
+        if ($request->input('chart_number')) {
+            $patients = $patients->where('chart_number', 'ILIKE' , '%'.$request->input('chart_number').'%');
         }
 
         if ($request->input('home_address_state')) {

+ 4 - 11
resources/views/app/admin/patients_filters.blade.php

@@ -195,16 +195,8 @@
 	@if($performer->pro->pro_type == 'ADMIN')
 	<div class="sm-section">
 		<div class="">
-			<label>Chart # ends with:</label>
-			<select class="form-control"  name="chart_number_ends_with" v-model="filters.chart_number_ends_with">
-				@php 
-					$chartNumbers = [1,2,3,4,5,6,7,8,9]
-				@endphp
-				<option value="ZERO">0</option>
-				@foreach($chartNumbers as $chartNum)
-					<option value="{{$chartNum}}">{{$chartNum}}</option>
-				@endforeach
-			</select>
+			<label>Chart #</label>
+			<input class="form-control"  name="chart_number" v-model="filters.chart_number">
 		</div>
 	</div>
 	@endif
@@ -391,7 +383,8 @@ $allFilterKeys = [
 	'number_of_measurements',
 	'number_of_measurements_value_1',
 	'number_of_measurements_value_2',
-	'home_address_state'
+	'home_address_state',
+	'chart_number'
 ];
 for ($i=0; $i < count($allFilterKeys); $i++) {
 	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {