This commit is contained in:
haomingming 2025-12-29 17:04:01 +08:00
parent deef662a31
commit bdd3990fa6
2 changed files with 7 additions and 6 deletions

View File

@ -56,7 +56,8 @@ type OrderProductDto struct {
OrderProductRefund *OrderProductRefundDto `json:"order_product_refund"` // 退款数据
OrderProductItem []*OrderProductItemDto `json:"order_product_item"` // 商品数据
OrderProductLogistics *OrderProductLogisticsDto `json:"order_product_logistics"` // 物流数据
UserDoctor *UserDoctorDto `json:"user_doctor"` // 原始医生(问诊医生信息)
UserDoctor *UserDoctorDto `json:"user_doctor"` // 原始医生
InquiryDoctor *UserDoctorDto `json:"inquiry_doctor"` // 问诊医生信息
TransferUserDoctor *UserDoctorDto `json:"transfer_prescription_doctor"` // 接受抄方的医生(抄方处方医生信息)
OrderPrescription *OrderPrescriptionDto `json:"order_prescription"` // 处方数据
OrderInquiryCase *OrderInquiryCaseDto `json:"order_inquiry_case"` // 问诊病例
@ -181,9 +182,9 @@ func GetOrderProductListDto(m []*model.OrderProduct) []*OrderProductDto {
response = response.LoadOrderInquiryAttr(v.OrderInquiry)
}
// 加载原医生信息
// 加载原问诊医生信息
if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil {
response = response.LoadUserDoctor(v.OrderInquiry.UserDoctor)
response = response.LoadInquiryDoctor(v.OrderInquiry.UserDoctor)
}
// 加载接受抄方的医生信息
@ -218,9 +219,9 @@ func (r *OrderProductDto) LoadDoctorName(m *model.UserDoctor) *OrderProductDto {
}
// LoadUserDoctor 加载问诊医生信息
func (r *OrderProductDto) LoadUserDoctor(m *model.UserDoctor) *OrderProductDto {
func (r *OrderProductDto) LoadInquiryDoctor(m *model.UserDoctor) *OrderProductDto {
if m != nil {
r.UserDoctor = GetUserDoctorDto(m)
r.InquiryDoctor = GetUserDoctorDto(m)
}
return r
}

View File

@ -70,7 +70,7 @@ func (r *OrderProductService) GetOrderProduct(orderProductId int64) (g *dto.Orde
// 加载原始医生信息
if orderProduct.OrderInquiry != nil && orderProduct.OrderInquiry.UserDoctor != nil {
g.LoadUserDoctor(orderProduct.OrderInquiry.UserDoctor)
g.LoadInquiryDoctor(orderProduct.OrderInquiry.UserDoctor)
}
// 加载接受抄方的医生信息