parent
373d50aba9
commit
bdd9375ab6
@ -2004,15 +2004,6 @@ class PatientOrderService extends BaseService
|
|||||||
$params = array();
|
$params = array();
|
||||||
$params['order_inquiry_id'] = $item['order_inquiry_id'];
|
$params['order_inquiry_id'] = $item['order_inquiry_id'];
|
||||||
$OrderInquiry = OrderInquiry::getOne($params);
|
$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)) {
|
||||||
//为抄方订单
|
//为抄方订单
|
||||||
if (!empty($OrderInquiry['transfer_doctor_id'])) {
|
if (!empty($OrderInquiry['transfer_doctor_id'])) {
|
||||||
@ -2020,46 +2011,22 @@ class PatientOrderService extends BaseService
|
|||||||
//若为抄方订单则显示原订单
|
//若为抄方订单则显示原订单
|
||||||
$params['doctor_id'] = $OrderInquiry['doctor_id'];
|
$params['doctor_id'] = $OrderInquiry['doctor_id'];
|
||||||
$fields = ['doctor_id','user_name','doctor_title'];
|
$fields = ['doctor_id','user_name','doctor_title'];
|
||||||
$UserDoctor = UserDoctor::getOne($params, $fields);
|
$TransferDoctor = UserDoctor::getOne($params, $fields);
|
||||||
if (!empty($UserDoctor)) {
|
if (!empty($TransferDoctor)) {
|
||||||
// 使用 setRelation 方法覆盖已加载的关联数据
|
$TransferDoctor->doctor_title = DoctorTitleCode::getMessage($TransferDoctor->doctor_title);
|
||||||
$item->setRelation('UserDoctor', $UserDoctor);
|
$item['TransferDoctor'] = $TransferDoctor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取 UserDoctor 关联对象并修改 doctor_title
|
// 获取 UserDoctor 关联对象并修改 doctor_title
|
||||||
$userDoctor = $item->getRelation('UserDoctor');
|
$userDoctor = $item['UserDoctor'];
|
||||||
if (!empty($userDoctor)) {
|
if (!empty($userDoctor)) {
|
||||||
// 修改模型属性
|
// 修改模型属性
|
||||||
$userDoctor->doctor_title = DoctorTitleCode::getMessage($userDoctor->doctor_title);
|
$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);
|
return success($order_prescription);
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->error("获取处方订单列表异常", [
|
Log::getInstance("PatientOrderService-getPatientPrescriptionOrderList")->error("获取处方订单列表异常", [
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user