update

app/Http/Controllers/Api/V1/DocterController.php

@@ -186,7 +186,7 @@ class DocterController extends AuthController
             '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');
+        $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');
 //        if (!empty($req['organization_id'])) {
 //            $builder->where('organization_id', $req['organization_id']);
 //        }
@@ -270,7 +270,6 @@ class DocterController extends AuthController
 
     public function timePeriodList()
     {
-
         $req = request()->post();
         $this->validate(request(), [
             'organization_id' => 'integer',
@@ -279,12 +278,22 @@ class DocterController extends AuthController
             'latitude' => 'numeric',
             'longitude' => 'numeric',
         ]);
-        $builder = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('organization_id', $req['organization_id'])->where('schedule_type', $req['schedule_type'])->where('schedule_day', '>=', date('Ymd'))->orderBy('schedule_day');
-        $data = $builder->paginate($req['per_page']??15)->toArray();
-        $docterSettings = DocterSetting::select(['service_num'])->where('org_id', $req['organization_id'])->where('type',$req['schedule_type'])->first();
+
+        $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($req['per_page']??15)->toArray();
+
+        $docterSettings = DocterSetting::select(['service_num'])->where('org_id', $req['organization_id'])->where('type', $req['schedule_type'])->first();
         if (!empty($data)) {
             foreach ($data['data'] as $k => &$v) {
-                if(empty($v['schedule_period'])) unset($data['data'][$k]);
+                if (empty($v['schedule_period'])) {
+                    unset($data['data'][$k]);
+                }
                 foreach ($v['schedule_period'] as $k1 => &$v1) {
                     if (empty($docterSettings)) {
                         $v1['can_appoint_num'] = 0;
@@ -296,7 +305,9 @@ class DocterController extends AuthController
                 }
             }
         }
+
         $data['data'] = array_values($data['data']);
+
         return out($data);
     }
 }

app/Http/Controllers/Api/V1/OrderController.php

@@ -8,7 +8,6 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Models\Docter;
 use App\Models\Nurse;
 use App\Models\Order;
 use App\Models\OrderNurse;