From bdd9375ab6128d3870ac9d1c02c73cb449d09d12 Mon Sep 17 00:00:00 2001 From: haomingming Date: Fri, 26 Dec 2025 14:39:20 +0800 Subject: [PATCH] 45 --- app/Services/PatientOrderService.php | 43 ++++------------------------ 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 08097f6..3e5bcd0 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -2004,15 +2004,6 @@ class PatientOrderService extends BaseService $params = array(); $params['order_inquiry_id'] = $item['order_inquiry_id']; $OrderInquiry = OrderInquiry::getOne($params); - // 打印原始的 UserDoctor 数据 - $originalUserDoctor = $item->getRelation('UserDoctor'); - if (!empty($originalUserDoctor)) { - Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->info("原始 UserDoctor 数据", [ - 'order_prescription_id' => $item['order_prescription_id'], - 'original_user_doctor' => $originalUserDoctor->toArray() - ]); - } - if (!empty($OrderInquiry)) { //为抄方订单 if (!empty($OrderInquiry['transfer_doctor_id'])) { @@ -2020,46 +2011,22 @@ class PatientOrderService extends BaseService //若为抄方订单则显示原订单 $params['doctor_id'] = $OrderInquiry['doctor_id']; $fields = ['doctor_id','user_name','doctor_title']; - $UserDoctor = UserDoctor::getOne($params, $fields); - if (!empty($UserDoctor)) { - // 使用 setRelation 方法覆盖已加载的关联数据 - $item->setRelation('UserDoctor', $UserDoctor); + $TransferDoctor = UserDoctor::getOne($params, $fields); + if (!empty($TransferDoctor)) { + $TransferDoctor->doctor_title = DoctorTitleCode::getMessage($TransferDoctor->doctor_title); + $item['TransferDoctor'] = $TransferDoctor; } } } // 获取 UserDoctor 关联对象并修改 doctor_title - $userDoctor = $item->getRelation('UserDoctor'); + $userDoctor = $item['UserDoctor']; if (!empty($userDoctor)) { // 修改模型属性 $userDoctor->doctor_title = DoctorTitleCode::getMessage($userDoctor->doctor_title); - - // 打印最终的 UserDoctor 数据 - Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->info("最终返回的 UserDoctor 数据", [ - 'order_prescription_id' => $item['order_prescription_id'], - 'final_user_doctor' => $userDoctor->toArray() - ]); } } } - - // 打印最终返回的数据摘要(可选,用于调试) - if (!empty($order_prescription['data'])) { - $summary = []; - foreach ($order_prescription['data'] as $item) { - $userDoctor = is_object($item) ? $item->getRelation('UserDoctor') : ($item['UserDoctor'] ?? null); - $summary[] = [ - 'order_prescription_id' => is_object($item) ? $item['order_prescription_id'] : $item['order_prescription_id'], - 'user_doctor' => $userDoctor ? (is_object($userDoctor) ? $userDoctor->toArray() : $userDoctor) : null - ]; - } - Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->info("最终返回的数据摘要", [ - 'total' => $order_prescription['total'] ?? 0, - 'current_page' => $order_prescription['current_page'] ?? 1, - 'data_summary' => $summary - ]); - } - return success($order_prescription); } catch (\Throwable $e) { Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->error("获取处方订单列表异常", [