diff --git a/api/dao/orderProduct.go b/api/dao/orderProduct.go index d9e1586..30cc0be 100644 --- a/api/dao/orderProduct.go +++ b/api/dao/orderProduct.go @@ -426,11 +426,20 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd return db.Select("order_prescription_id", "prescription_code") }) + // 问诊订单 + // query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB { + // return db.Select("order_inquiry_id", "patient_name", "patient_name_mask", "patient_sex", "patient_age") + // }) // 问诊订单 query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB { - return db.Select("order_inquiry_id", "patient_name", "patient_name_mask", "patient_sex", "patient_age") + return db.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB { + return db.Select("user_id", "user_name", "doctor_id") + }).Preload("TransferUserDoctor", func(db *gorm.DB) *gorm.DB { + return db.Select("user_id", "user_name", "doctor_id") + }) }) + // 患者 query = query.Preload("UserPatient.User", func(db *gorm.DB) *gorm.DB { return db.Select("user_id", "user_name", "mobile") diff --git a/api/service/export.go b/api/service/export.go index 93a8878..c33175e 100644 --- a/api/service/export.go +++ b/api/service/export.go @@ -1571,13 +1571,13 @@ func (r *ExportService) OrderProduct(d []*model.OrderProduct) (string, error) { ConsigneeTel: v.ConsigneeTel, } - if v.UserDoctor != nil { + if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil { // 医生姓名 - data.DoctorName = v.UserDoctor.UserName + data.DoctorName = v.OrderInquiry.UserDoctor.UserName - if v.UserDoctor.User != nil { + if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil && v.UserDoctor.User != nil { // 医生电话 - data.DoctorMobile = v.UserDoctor.User.Mobile + data.DoctorMobile = v.OrderInquiry.UserDoctor.User.Mobile } }