修正分配医生逻辑，修改搜索医生列表新增是否参加公益图文问诊字段

app/Model/DoctorInquiryTime.php

@@ -80,7 +80,7 @@ class DoctorInquiryTime extends Model
     }
 
     /**
-     * 获取数据-单
+     * 获取数据-多
      * 关联医生表
      * @param array $params
      * @param array $user_doctor_params
@@ -96,4 +96,22 @@ class DoctorInquiryTime extends Model
             ->get($fields);
     }
 
+    /**
+     * 获取数据-多
+     * 关联医生表
+     * @param array $params
+     * @param array $user_doctor_params
+     * @param array $user_doctor_not_in_params
+     * @param array $fields
+     * @return array|Collection
+     */
+    public static function getWithDoctorNotInList(array $params = [],array $user_doctor_params = [], array $user_doctor_not_in_params = [], array $fields = ['*']): array|Collection
+    {
+        return self::whereHas('UserDoctor' , function($query) use ($user_doctor_params,$user_doctor_not_in_params){
+            $query->where($user_doctor_params)->whereNotIn('doctor_id',$user_doctor_not_in_params);
+        })
+            ->where($params)
+            ->get($fields);
+    }
+
 }

app/Model/OrderInquiry.php

@@ -197,7 +197,7 @@ class OrderInquiry extends Model
      * @param array $fields
      * @return Collection|array
      */
-    public static function getInquiryStatusList(array $params,array $inquiry_status_params,array $fields = ["*"]): Collection|array
+    public static function getInquiryStatusWithDoctorList(array $params, array $inquiry_status_params, array $fields = ["*"]): Collection|array
     {
         return self::with([
             'UserDoctor' => function ($query){
@@ -209,6 +209,41 @@ class OrderInquiry extends Model
             ->get($fields);
     }
 
+    /**
+     * 获取某种状态的所有订单
+     * @param array $params
+     * @param array $inquiry_status_params
+     * @param array $not_in_params
+     * @param array $fields
+     * @return Collection|array
+     */
+    public static function getInquiryStatusWithDoctorNotInList(array $params, array $inquiry_status_params,array $not_in_params, array $fields = ["*"]): Collection|array
+    {
+        return self::with([
+            'UserDoctor' => function ($query){
+                $query->orderBy('is_platform_deep_cooperation', 'desc');
+            }
+        ])
+            ->where($params)
+            ->whereIn('inquiry_status',$inquiry_status_params)
+            ->whereNotIn('doctor_id',$not_in_params)
+            ->get($fields);
+    }
+
+    /**
+     * 获取某种状态的订单
+     * @param array $params
+     * @param array $inquiry_status_params
+     * @param array $fields
+     * @return object|null
+     */
+    public static function getInquiryStatusOne(array $params,array $inquiry_status_params,array $fields = ["*"]): object|null
+    {
+        return self::where($params)
+            ->whereIn('inquiry_status',$inquiry_status_params)
+            ->first($fields);
+    }
+
     /**
      * 修改
      * @param array $params
@@ -263,4 +298,17 @@ class OrderInquiry extends Model
     {
         return self::where($params)->whereIn('order_inquiry_id',$in_params)->get($fields);
     }
+
+
+    /**
+     * 获取某种状态的订单总数
+     * @param array $params
+     * @param array $inquiry_status_params
+     * @return int
+     */
+    public static function getInquiryStatusCount(array $params, array $inquiry_status_params): int
+    {
+        return self::where($params)->whereIn("inquiry_status",$inquiry_status_params)->count();
+    }
+
 }

app/Model/UserDoctor.php

@@ -295,4 +295,16 @@ class UserDoctor extends Model
             ->where($params)
             ->first($fields);
     }
+
+    /**
+     * 获取数据单
+     * @param array $params
+     * @param array $not_in_params
+     * @param array $fields
+     * @return object|null
+     */
+    public static function getUserDoctorNotInOne(array $params = [], array $not_in_params = [],array $fields = ['*']): object|null
+    {
+        return self::where($params)->whereNotIn('doctor_id',$not_in_params)->first($fields);
+    }
 }