This commit is contained in:
haomingming 2026-01-06 17:22:44 +08:00
parent ffff3ee5f3
commit 9937ef8e0c

View File

@ -444,17 +444,19 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req
prescriptionTable := (&model.OrderPrescription{}).TableName() prescriptionTable := (&model.OrderPrescription{}).TableName()
inquiryTable := (&model.OrderInquiry{}).TableName() inquiryTable := (&model.OrderInquiry{}).TableName()
userDoctorTable := (&model.UserDoctor{}).TableName() userTable := (&model.User{}).TableName()
doctorTable := (&model.UserDoctor{}).TableName()
// 构建查询条件 // 构建查询条件
query := global.Db.Model(&model.OrderPrescription{}) query := global.Db.Model(&model.OrderPrescription{})
// 关联问诊表只查询TransferDoctorId不等于null的记录 // 关联问诊表只查询TransferDoctorId不等于null的记录
query = query. query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id").
Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id").
Joins("INNER JOIN " + userDoctorTable + " ON " + inquiryTable + ".transfer_doctor_id = " + userDoctorTable + ".doctor_id").
Where(inquiryTable + ".transfer_doctor_id IS NOT NULL") Where(inquiryTable + ".transfer_doctor_id IS NOT NULL")
// 关联抄方医生表
query = query.Joins("LEFT JOIN " + doctorTable + " ON " + inquiryTable + ".doctor_id = " + doctorTable + ".doctor_id")
// 患者表 // 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB { query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key") return db.Omit("open_id", "union_id", "wx_session_key")
@ -492,9 +494,9 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req
// if req.DoctorName != "" { // if req.DoctorName != "" {
// query = query.Where("doctor_name LIKE ?", "%"+req.DoctorName+"%") // query = query.Where("doctor_name LIKE ?", "%"+req.DoctorName+"%")
// } // }
// 医生名称 - 查询抄方医生名称(来自 gdxz_user_doctor.user_name // 医生名称 - 查询抄方医生名称
if req.DoctorName != "" { if req.DoctorName != "" {
query = query.Where(userDoctorTable+".user_name LIKE ?", "%"+req.DoctorName+"%") query = query.Where(userTable+".user_name LIKE ?", "%"+req.DoctorName+"%")
} }
// 患者姓名-就诊人 // 患者姓名-就诊人