From 72a19d09a6f3f05e5ad57c8ba4f2d7bb1ef8c832 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 26 Apr 2023 17:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=85=8D=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E8=A7=84=E5=88=99=EF=BC=8C=E5=8E=BB=E9=99=A410?=
 =?UTF-8?q?=E3=80=8130=E5=88=86=E9=92=9F=E5=86=85=E6=8E=A5=E8=AF=8A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E5=8C=BB=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/UserDoctorService.php | 58 +-----------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index 57bf6b6..5d06721 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -1867,25 +1867,7 @@ class UserDoctorService extends BaseService
             }
         }
 
-//        // 获取全部深度合作的在线医生
-//        $user_doctor = $this->getOnlineDeepDoctor($inquiry_type,$not_doctor_ids);
-//        if (!empty($user_doctor)){
-//            $doctor_ids = array_column($user_doctor,'doctor_id');
-//            Log::getInstance()->info("获取全部深度合作的在线医生:" ,$doctor_ids);
-//
-//            // 检测医生是否可被分配
-//            $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,0,$inquiry_type);
-//            Log::getInstance()->info("检测医生是否可被分配:" ,$result);
-//            if (!empty($result['doctor_id'])){
-//                return $result['doctor_id'];
-//            }
-//
-//            if (!empty($result['not_doctor_ids'])){
-//                $not_doctor_ids = array_merge($not_doctor_ids,$result['not_doctor_ids']);
-//            }
-//        }
-
-        // 获取在线的自由注册医生
+        // 获取自由注册医生
         $user_doctor = $this->getOnlineDoctor($inquiry_type,$not_doctor_ids);
         if (!empty($user_doctor)){
             $doctor_ids = array_column($user_doctor,'doctor_id');
@@ -1914,42 +1896,6 @@ class UserDoctorService extends BaseService
             if (!empty($result['doctor_id'])){
                 return $result['doctor_id'];
             }
-
-            if (!empty($result['not_doctor_ids'])){
-                $not_doctor_ids = array_merge($not_doctor_ids,$result['not_doctor_ids']);
-            }
-        }
-
-        // 当前时间10分钟内接诊中医生
-        $doctors = $this->getBeforeCurrentTimeDoctor(10,$inquiry_type,$not_doctor_ids);
-        if (!empty($doctors)){
-            $doctor_ids = array_column($doctors,'doctor_id');
-            Log::getInstance()->info("当前时间10分钟内接诊中医生:" ,$doctor_ids);
-
-            // 检测医生是否可被分配
-            $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type);
-            Log::getInstance()->info("检测医生是否可被分配:" ,$result);
-            if (!empty($result['doctor_id'])){
-                return $result['doctor_id'];
-            }
-
-            if (!empty($result['not_doctor_ids'])){
-                $not_doctor_ids = array_merge($not_doctor_ids,$result['not_doctor_ids']);
-            }
-        }
-
-        // 当前时间30分钟内接诊中医生
-        $doctors = $this->getBeforeCurrentTimeDoctor(30,$inquiry_type,$not_doctor_ids);
-        if (!empty($doctors)){
-            $doctor_ids = array_column($doctors,'doctor_id');
-            Log::getInstance()->info("当前时间10分钟内接诊中医生:" ,$doctor_ids);
-
-            // 检测医生是否可被分配
-            $result = $this->checkDoctorCanBeAssigned($doctor_ids,$patient_id,1,$inquiry_type);
-            Log::getInstance()->info("检测医生是否可被分配:" ,$result);
-            if (!empty($result['doctor_id'])){
-                return $result['doctor_id'];
-            }
         }
 
         return "";
@@ -2089,13 +2035,11 @@ class UserDoctorService extends BaseService
      */
     public function getOnlineDoctor(string $inquiry_type,array $not_doctor_ids): array
     {
-        //
         $params = array();
         $params['status'] = 1;
         $params['idcard_status'] = 1;
         $params['iden_auth_status'] = 1;
         $params['is_bind_bank'] = 1;
-        $params['is_online'] = 1;
         if ($inquiry_type == 2){
             // 快速问诊
             $params['is_img_quick_reception'] = 1;