修改医生列表

app/Services/PatientDoctorService.php

@@ -38,7 +38,24 @@ class PatientDoctorService extends BaseService
         $per_page = $this->request->input('per_page',10);
 
         // 组合条件
+        $hospital_params = array();// 医院搜索
         $doctor_params = array();// 医生搜索
+        $doctor_expertise_params = array();// 医生专长搜索
+
+        // 省市区
+        if (!empty($province_id)) {
+            if (empty($city_id)) {
+                // 省份存在时需和城市在一块
+                return fail(HttpEnumCode::CLIENT_HTTP_ERROR);
+            }
+            $hospital_params[] = ['province_id', '=', $province_id];
+            $hospital_params[] = ['city_id', '=', $city_id];
+        }
+
+        // 医生专长
+        if (!empty($expertise_id)) {
+            $doctor_expertise_params['expertise_id'] = $expertise_id;
+        }
 
         // 固定医生查询条件
         $doctor_params['status'] = 1; // 状态（0:禁用 1:正常 2:删除）
@@ -73,7 +90,7 @@ class PatientDoctorService extends BaseService
             "be_good_at",
         ];
 
-        $user_doctors = UserDoctor::getInquiryDoctorPage($keyword, $doctor_params, $sort_order, $fields,$page,$per_page);
+        $user_doctors = UserDoctor::getInquiryDoctorPage($keyword,$hospital_params, $doctor_params,$doctor_expertise_params, $sort_order, $fields,$page,$per_page);
 
         // 处理数据
         if (!empty($user_doctors['data'])) {

app/Services/UserDoctorService.php

@@ -484,9 +484,14 @@ class UserDoctorService extends BaseService
         // 获取处方数据
         $params = array();
         $params['doctor_id'] = $user_info['client_user_id'];
-        $params['prescription_status'] = 1;
         $params['pharmacist_audit_status'] = $pharmacist_audit_status;
         $params['is_delete'] = 0;
+
+        if ($pharmacist_audit_status == 1){
+            // 审核通过
+            $params['platform_audit_status'] = 1;
+        }
+
         $order_prescriptions = OrderPrescription::getWithIcdPage($params,['*'],$page,$per_page);
         if (empty($order_prescriptions)) {
             return success($order_prescriptions);