From 9937ef8e0c652583e92b2d31a65713741a9b2fad Mon Sep 17 00:00:00 2001 From: haomingming Date: Tue, 6 Jan 2026 17:22:44 +0800 Subject: [PATCH] 17 --- api/dao/orderPrescription.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/api/dao/orderPrescription.go b/api/dao/orderPrescription.go index 160fbfc..8cfc0c3 100644 --- a/api/dao/orderPrescription.go +++ b/api/dao/orderPrescription.go @@ -444,17 +444,19 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req prescriptionTable := (&model.OrderPrescription{}).TableName() inquiryTable := (&model.OrderInquiry{}).TableName() - userDoctorTable := (&model.UserDoctor{}).TableName() + userTable := (&model.User{}).TableName() + doctorTable := (&model.UserDoctor{}).TableName() // 构建查询条件 query := global.Db.Model(&model.OrderPrescription{}) // 关联问诊表，只查询TransferDoctorId不等于null的记录 - query = query. - 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"). + query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id"). 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 { return db.Omit("open_id", "union_id", "wx_session_key") @@ -492,9 +494,9 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req // if req.DoctorName != "" { // query = query.Where("doctor_name LIKE ?", "%"+req.DoctorName+"%") // } - // 医生名称 - 查询抄方医生名称（来自 gdxz_user_doctor.user_name） + // 医生名称 - 查询抄方医生名称 if req.DoctorName != "" { - query = query.Where(userDoctorTable+".user_name LIKE ?", "%"+req.DoctorName+"%") + query = query.Where(userTable+".user_name LIKE ?", "%"+req.DoctorName+"%") } // 患者姓名-就诊人