This commit is contained in:
haomingming 2025-12-29 17:10:42 +08:00
parent bdd3990fa6
commit 7a51cec28b
2 changed files with 8 additions and 7 deletions

View File

@ -37,7 +37,8 @@ type OrderPrescriptionDto struct {
OrderPrescriptionIcd string `json:"order_prescription_icd"` // 处方诊断疾病 OrderPrescriptionIcd string `json:"order_prescription_icd"` // 处方诊断疾病
OrderInquiryCase *OrderInquiryCaseDto `json:"order_inquiry_case"` // 问诊病例 OrderInquiryCase *OrderInquiryCaseDto `json:"order_inquiry_case"` // 问诊病例
OrderPrescriptionProduct []*OrderPrescriptionProductDto `json:"order_prescription_product"` // 处方商品 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"` // 接受抄方的医生(抄方处方医生信息) TransferUserDoctor *UserDoctorDto `json:"transfer_prescription_doctor"` // 接受抄方的医生(抄方处方医生信息)
CreatedAt model.LocalTime `json:"created_at"` // 创建时间 CreatedAt model.LocalTime `json:"created_at"` // 创建时间
UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间 UpdatedAt model.LocalTime `json:"updated_at"` // 修改时间
@ -127,9 +128,9 @@ func GetOrderPrescriptionListDto(m []*model.OrderPrescription) []*OrderPrescript
response = response.LoadOrderPrescriptionIcdString(v.OrderPrescriptionIcd) response = response.LoadOrderPrescriptionIcdString(v.OrderPrescriptionIcd)
} }
// 加载原始医生信息 // 加载问诊医生信息
if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil { 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 return r
} }
// LoadUserDoctor 加载原始医生信息 // LoadUserDoctor 加载问诊医生信息
func (r *OrderPrescriptionDto) LoadUserDoctor(m *model.UserDoctor) *OrderPrescriptionDto { func (r *OrderPrescriptionDto) LoadInquiryDoctor(m *model.UserDoctor) *OrderPrescriptionDto {
if m != nil { if m != nil {
r.UserDoctor = GetUserDoctorDto(m) r.InquiryDoctor = GetUserDoctorDto(m)
} }
return r return r
} }

View File

@ -84,7 +84,7 @@ func (r *OrderPrescriptionService) GetOrderPrescription(OrderPrescriptionId int6
// 加载原始医生信息 // 加载原始医生信息
if orderPrescription.OrderInquiry != nil && orderPrescription.OrderInquiry.UserDoctor != nil { if orderPrescription.OrderInquiry != nil && orderPrescription.OrderInquiry.UserDoctor != nil {
g.LoadUserDoctor(orderPrescription.OrderInquiry.UserDoctor) g.LoadInquiryDoctor(orderPrescription.OrderInquiry.UserDoctor)
} }
// 加载接受抄方的医生信息 // 加载接受抄方的医生信息