| xqd
@@ -180,17 +180,12 @@ class DocterController extends AuthController
|
|
|
$req = request()->post();
|
|
|
$this->validate(request(), [
|
|
|
'docter_id' => 'required|integer',
|
|
|
- 'organization_id' => 'integer',
|
|
|
'per_page' => 'integer',
|
|
|
'latitude' => 'numeric',
|
|
|
'longitude' => 'numeric',
|
|
|
]);
|
|
|
$user = $this->user;
|
|
|
- $builder = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('docter_id', $req['docter_id'])->where('schedule_type', 1)->where('schedule_day', '>=', date('Ymd'))->orderBy('schedule_day', 'asc');
|
|
|
- if (!empty($req['organization_id'])) {
|
|
|
- $builder->where('organization_id', $req['organization_id']);
|
|
|
- }
|
|
|
- $data = $builder->paginate($req['per_page']??15)->toArray();
|
|
|
+ $data = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('docter_id', $req['docter_id'])->where('schedule_type', 1)->where('schedule_day', '>=', date('Ymd'))->orderBy('schedule_day', 'asc')->paginate($req['per_page']??15)->toArray();
|
|
|
if (!empty($data)) {
|
|
|
foreach ($data['data'] as $k => &$v) {
|
|
|
foreach ($v['schedule_period'] as $k1 => &$v1) {
|