zilong 4 年之前
父节点
当前提交
5d37a32cf5
共有 1 个文件被更改,包括 1 次插入9 次删除
  1. 1 9
      app/Http/Controllers/Api/V1/DocterController.php

+ 1 - 9
app/Http/Controllers/Api/V1/DocterController.php

xqd
@@ -235,21 +235,13 @@ class DocterController extends AuthController
         $this->validate(request(), [
             'organization_id' => 'required|integer',
             'schedule_type' => 'required|integer',
-            'per_page' => 'integer',
             'latitude' => 'numeric',
             'longitude' => 'numeric',
         ]);
 
         $docterSettings = DocterSetting::select(['service_num', 'show_days'])->where('org_id', $req['organization_id'])->where('type', $req['schedule_type'])->first();
         $per_page = !empty($docterSettings['show_days']) ? $docterSettings['show_days'] : 15;
-        $builder = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('schedule_day', '>=', date('Ymd'));
-        if (!empty($req['organization_id'])) {
-            $builder->where('organization_id', $req['organization_id']);
-        }
-        if (!empty($req['schedule_type'])) {
-            $builder->where('schedule_type', $req['schedule_type']);
-        }
-        $data = $builder->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
+        $data = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('schedule_day', '>=', date('Ymd'))->where('organization_id', $req['organization_id'])->where('schedule_type', $req['schedule_type'])->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
 
         if (!empty($data)) {
             foreach ($data['data'] as $k => &$v) {