gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

12

Browse Source
This commit is contained in:
haomingming 2026-01-06 16:58:46 +08:00
parent 92781a3624
commit 32734e14f1
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/dao/orderProduct.go
View File

@ -426,11 +426,20 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
return db.Select("order_prescription_id", "prescription_code") 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 { 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 { query = query.Preload("UserPatient.User", func(db *gorm.DB) *gorm.DB {
return db.Select("user_id", "user_name", "mobile") return db.Select("user_id", "user_name", "mobile")

8
api/service/export.go
View File

@ -1571,13 +1571,13 @@ func (r *ExportService) OrderProduct(d []*model.OrderProduct) (string, error) {
ConsigneeTel: v.ConsigneeTel, 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
} }
} }