mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:41:07 +03:30
modify backend
This commit is contained in:
@@ -55,8 +55,7 @@ class TestResultController extends Controller
|
||||
$user_name = null;
|
||||
}
|
||||
|
||||
$TestResult = TestResult::with('test_type', 'user', 'user.medical_center')
|
||||
->when($request->has('verified'), function ($query) use ($request){
|
||||
$TestResult = TestResult::when($request->has('verified'), function ($query) use ($request){
|
||||
return $query->where('verified', $request->verified);
|
||||
})
|
||||
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request){
|
||||
@@ -92,6 +91,15 @@ class TestResultController extends Controller
|
||||
$query->where('medical_center_id', $medical_center_id);
|
||||
});
|
||||
})
|
||||
->with(['user' => function($query){
|
||||
$query->select('id', 'name', 'medical_center_id');
|
||||
},
|
||||
'user.medical_center' => function($query){
|
||||
$query->select('id', 'name');
|
||||
},
|
||||
'test_type' => function($query){
|
||||
$query->select('id', 'name');
|
||||
}])
|
||||
->paginate(10);
|
||||
|
||||
return \MessageResponse::data($TestResult);
|
||||
|
||||
Reference in New Issue
Block a user