Merge branch 'develop'

app/Http/Controllers/Api/V2/DoctorController.php

@@ -1069,7 +1069,7 @@ class DoctorController extends AuthController
      * Auth:Yuanhang-Liu
      * Date:2020/10/17 13:21
      * @return \Illuminate\Http\JsonResponse
-     */ 
+     */
     public function userList()
     {
         $req = request()->post();
@@ -1333,10 +1333,9 @@ class DoctorController extends AuthController
         // 查询详情;
         $finds_patient = User::with('patients')->where('id', '=', $req['user_id'])->first();
         $remarks = UserDocter::where('user_id', '=', $req['user_id'])->first();
-
-
         $find_wheres['order_status'] = 4;
         $find_wheres['user_id'] = $req['user_id'];
+        $find_wheres['docter_id'] = $user['id'];
         $finds_order = Order::with('orderPatient')->where($find_wheres)->orderBy('created_at', 'desc')->limit(3)->get();
         if ($finds_order) {
             $finds_order = $finds_order->toArray();
@@ -1345,7 +1344,8 @@ class DoctorController extends AuthController
         $patientsArr = [];
         $ws['user_id'] = $req['user_id'];
         $ws['product_type'] = 6;
-        $fuw_order = Order::with('orderPack')->where($ws)->whereIn('order_status',[3,4])->orderBy('created_at', 'desc')->get();
+        $ws['order_status'] = 3;
+        $fuw_order = Order::with('orderPack')->where($ws)->orderBy('created_at', 'desc')->get();
         if ($fuw_order) {
             $fuw_order = $fuw_order->toArray();
             foreach ($fuw_order as $kk => $vv) {
@@ -1366,7 +1366,6 @@ class DoctorController extends AuthController
             }
         }
 
-
         if ($finds_patient) {
             $finds_patient = $finds_patient->toArray();
             $userArr['id'] = $finds_patient['id'];