1

app/Model/UserDoctorInfo.php

@@ -42,7 +42,7 @@ class UserDoctorInfo extends Model
     protected string $primaryKey = "doctor_info_id";
 
     /**
-     * 获取-单条
+     * 获取单条
      * @param array $params
      * @param array $fields
      * @return object|null
@@ -52,6 +52,8 @@ class UserDoctorInfo extends Model
         return self::where($params)->first($fields);
     }
 
+
+
     /**
      * 新增医生详情-批量
      * @param array $data 新增数据

app/Services/PatientOrderService.php

@@ -13,6 +13,7 @@ use App\Model\OrderPrescription;
 use App\Model\OrderPrescriptionProduct;
 use App\Model\OrderProduct;
 use App\Model\OrderProductItem;
+use App\Model\PatientFollow;
 use App\Model\Product;
 use App\Model\ProductPlatformAmount;
 use App\Model\UserDoctor;
@@ -235,7 +236,16 @@ class PatientOrderService extends BaseService
                 $user_doctor['hospital_level_name'] = $hospital['hospital_level_name'];
             }
 
+            // 获取医生关注状态
+            $params = array();
+            $params['patient_id'] = $user_info['client_user_id'];
+            $params['doctor_id'] = $user_doctor['doctor_id'];
+            $user_doctor['follow'] = PatientFollow::getExists($params);
+
             $order_inquiry['user_doctor'] = $user_doctor;
+
+
+
             unset($hospital);
             unset($user_doctor);
         }

app/Services/UserDoctorService.php

@@ -265,7 +265,7 @@ class UserDoctorService extends BaseService
         $params['doctor_id'] = $user_doctor['doctor_id'];
         $user_doctor_info = UserDoctorInfo::getOne($params);
         if (empty($user_doctor_info)){
-            return fail();
+            return fail(HttpEnumCode::HTTP_ERROR,"医生详情错误");
         }
 
         // 处理银行卡掩码

app/Services/UserPharmacistService.php

@@ -4,7 +4,9 @@ namespace App\Services;
 
 use App\Constants\HttpEnumCode;
 use App\Model\OrderPrescription;
+use App\Model\User;
 use App\Model\UserPharmacist;
+use App\Model\UserPharmacistInfo;
 
 /**
  * 药师
@@ -166,7 +168,24 @@ class UserPharmacistService extends BaseService
     {
         $user_info = $this->request->getAttribute("userInfo") ?? [];
 
+        // 获取用户数据
+        $fields = [
+            'age',
+            'sex',
+            'avatar',
+        ];
+        $params = array();
+        $params['user_id'] = $user_info['user_id'];
+        $user = User::getOne($params,$fields);
+        if (empty($user)){
+            return fail();
+        }
+
         // 获取药师数据
+        $fields = [
+            'pharmacist_id',
+            'pharmacist_id',
+        ];
         $params = array();
         $params['user_id'] = $user_info['user_id'];
         $user_pharmacist = UserPharmacist::getOne($params);
@@ -177,6 +196,11 @@ class UserPharmacistService extends BaseService
         // 获取药师详情数据
         $params = array();
         $params['user_id'] = $user_info['user_id'];
+        $user_pharmacist_info = UserPharmacistInfo::getOne($params);
+        if (empty($user_pharmacist_info)){
+            return fail();
+        }
+
 
     }
 }