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

app/Services/InquiryService.php

@@ -60,10 +60,10 @@ class InquiryService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR, "患者信息错误");
         }
 
-        // 检测当前家庭成员是否存在未完成的问诊订单
-        $UserPatientService = new UserPatientService();
-        $res = $UserPatientService->getNotFinishedOrdeInquiry($user_info['client_user_id']);
-        if (!empty($res)) {
+        // 检测是否存在同类型未完成的问诊订单
+        $PatientOrderService = new PatientOrderService();
+        $order_inquiry_id = $PatientOrderService->getNotFinishedOrdeInquiry($user_info['client_user_id']);
+        if (!empty($order_inquiry_id)) {
             return fail(HttpEnumCode::HTTP_ERROR, "当前患者存在进行中的问诊订单");
         }
 
@@ -863,4 +863,33 @@ class InquiryService extends BaseService
         return $result;
     }
 
+    /**
+     * 检测当前医生是否和患者存在未完成问诊订单
+     * @param string $patient_id
+     * @param string $doctor_id
+     * @return array
+     */
+    public function checkPatientDoctorProgressInquiry(string $patient_id,string $doctor_id): array
+    {
+        $params = array();
+        if (!empty($patient_id)){
+            $params[] = ['patient_id','=',$patient_id];
+        }
+
+        if (!empty($family_id)){
+            $params[] = ['family_id','=',$family_id];
+        }
+
+        $params = array();
+        $params[] = ['patient_id','=',$patient_id];
+        $params[] = ['doctor_id','=',$doctor_id];
+
+        $inquiry_status_params = [1,3,4];// 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+        $order_inquiry = OrderInquiry::getInquiryStatusOne($params, $inquiry_status_params);
+        if (empty($order_inquiry)) {
+            return [];
+        }
+
+        return $order_inquiry->toArray();
+    }
 }