From 7a51cec28bbb405c5bef3c1397218b400c8da02c Mon Sep 17 00:00:00 2001
From: haomingming <haomingming@igandan.org>
Date: Mon, 29 Dec 2025 17:10:42 +0800
Subject: [PATCH] 34

---
 api/dto/OrderPrescription.go     | 13 +++++++------
 api/service/orderPrescription.go |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/dto/OrderPrescription.go b/api/dto/OrderPrescription.go
index fc80902..52e5c85 100644
--- a/api/dto/OrderPrescription.go
+++ b/api/dto/OrderPrescription.go
@@ -37,7 +37,8 @@ type OrderPrescriptionDto struct {
 	OrderPrescriptionIcd     string                         `json:"order_prescription_icd"`     // 处方诊断疾病
 	OrderInquiryCase         *OrderInquiryCaseDto           `json:"order_inquiry_case"`         // 问诊病例
 	OrderPrescriptionProduct []*OrderPrescriptionProductDto `json:"order_prescription_product"` // 处方商品
-	UserDoctor               *UserDoctorDto                 `json:"user_doctor"`             // 原始医生（问诊医生信息）
+	UserDoctor               *UserDoctorDto                 `json:"user_doctor"`                // 原始医生
+	InquiryDoctor            *UserDoctorDto                 `json:"inquiry_doctor"`             // 问诊医生信息
 	TransferUserDoctor       *UserDoctorDto                 `json:"transfer_prescription_doctor"`     // 接受抄方的医生（抄方处方医生信息）
 	CreatedAt                model.LocalTime                `json:"created_at"`                 // 创建时间
 	UpdatedAt                model.LocalTime                `json:"updated_at"`                 // 修改时间
@@ -127,9 +128,9 @@ func GetOrderPrescriptionListDto(m []*model.OrderPrescription) []*OrderPrescript
 				response = response.LoadOrderPrescriptionIcdString(v.OrderPrescriptionIcd)
 			}
 
-			// 加载原始医生信息
+			// 加载问诊医生信息
 			if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil {
-				response = response.LoadUserDoctor(v.OrderInquiry.UserDoctor)
+				response = response.LoadInquiryDoctor(v.OrderInquiry.UserDoctor)
 			}
 
 			// 加载接受抄方的医生信息
@@ -218,10 +219,10 @@ func (r *OrderPrescriptionDto) LoadOrderProductId(m *model.OrderProduct) *OrderP
 	return r
 }
 
-// LoadUserDoctor 加载原始医生信息
-func (r *OrderPrescriptionDto) LoadUserDoctor(m *model.UserDoctor) *OrderPrescriptionDto {
+// LoadUserDoctor 加载问诊医生信息
+func (r *OrderPrescriptionDto) LoadInquiryDoctor(m *model.UserDoctor) *OrderPrescriptionDto {
 	if m != nil {
-		r.UserDoctor = GetUserDoctorDto(m)
+		r.InquiryDoctor = GetUserDoctorDto(m)
 	}
 	return r
 }
diff --git a/api/service/orderPrescription.go b/api/service/orderPrescription.go
index 7a0bba2..1448114 100644
--- a/api/service/orderPrescription.go
+++ b/api/service/orderPrescription.go
@@ -84,7 +84,7 @@ func (r *OrderPrescriptionService) GetOrderPrescription(OrderPrescriptionId int6
 
 	// 加载原始医生信息
 	if orderPrescription.OrderInquiry != nil && orderPrescription.OrderInquiry.UserDoctor != nil {
-		g.LoadUserDoctor(orderPrescription.OrderInquiry.UserDoctor)
+		g.LoadInquiryDoctor(orderPrescription.OrderInquiry.UserDoctor)
 	}
 
 	// 加载接受抄方的医生信息