更新

app/Community/Controllers/ApiController.php

@@ -5,6 +5,7 @@ namespace App\Community\Controllers;
 
 
 use App\Http\Controllers\Controller;
+use App\Imports\Docter\DocterOrganizationInfo;
 use App\Models\Area;
 use App\Models\Docter;
 use App\Models\DocterOrganization;
@@ -47,11 +48,19 @@ class ApiController extends Controller
     public function getDocter()
     {
         $user = Admin::user();
+        $org_id = $user->org_id;
         $where = [];
         if ($user->docter_id) {
             $where ['id'] = $user->docter_id;
+            return Docter::where($where)->get(['name as text', 'id'])->toArray();
+        }
+        if ($org_id)
+        {
+            $docter_arr =  DocterOrganization::where('organization_id',$org_id)->where('state',1)->pluck('docter_id')->toArray();
+            return Docter::whereIn('id',$docter_arr)->get(['name as text', 'id'])->toArray();
+        }else{
+            return Docter::where($where)->get(['name as text', 'id'])->toArray();
         }
-        return Docter::where($where)->get(['name as text', 'id'])->toArray();
     }
 
     /**

app/Community/Controllers/OrderController.php

@@ -6,6 +6,7 @@ use App\Community\Actions\Clinc\Finished;
 use App\Community\Actions\Clinc\OrderCancel;
 use App\Community\Actions\Clinc\Reserved;
 use App\Models\Docter;
+use App\Models\DocterOrganization;
 use App\Models\Order;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Facades\Admin;
@@ -41,7 +42,6 @@ class OrderController extends AdminController
             } );
         });
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
-
         //检查是否是门诊医生
         $is_docter = $user->isRole('opc');
         $org_id = $user->org_id;
@@ -53,7 +53,7 @@ class OrderController extends AdminController
             $where ['organization_id']=$org_id;
         }
         $res = request()->all();
-        $grid->model()->where($where);
+        $grid->model()->where($where)->where('payment_status','!=',1);
         if(!empty($res['orderPatient']['appoint_start_time']['start']) || !empty($res['orderPatient']['appoint_start_time']['start']) ){
             $grid->model()->orderBy('appoint_start_time','desc');
         } else {