This commit is contained in:
haomingming 2026-01-06 14:53:24 +08:00
parent 7fc14a3642
commit b450125512

View File

@ -260,18 +260,21 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionTransferPageSearch(req reques
prescriptionTable := (&model.OrderPrescription{}).TableName()
inquiryTable := (&model.OrderInquiry{}).TableName()
doctorTable := (&model.UserDoctor{}).TableName()
userTable := (&model.User{}).TableName() // 新增
userTable := (&model.User{}).TableName()
// 构建查询条件
query := global.Db.Model(&model.OrderPrescription{})
// 关联问诊表只查询TransferDoctorId不等于null的记录
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("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 + ".transfer_doctor_id = " + doctorTable + ".doctor_id")
// 关联抄方医生对应的用户表(用于按用户姓名查询)
query = query.Joins("LEFT JOIN " + userTable + " ON " + doctorTable + ".user_id = " + userTable + ".user_id")
// 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key")
@ -435,19 +438,18 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionTransferPageSearch(req reques
return m, totalRecords, nil
}
// GetOrderPrescriptionExportListSearch 获取抄方的处方列表-导出
func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req requests.OrderPrescriptionExportList) (m []*model.OrderPrescription, err error) {
prescriptionTable := (&model.OrderPrescription{}).TableName()
inquiryTable := (&model.OrderInquiry{}).TableName()
// 构建查询条件
query := global.Db.Model(&model.OrderPrescription{})
// 关联问诊表只查询TransferDoctorId不等于null的记录
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("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id").
Where(inquiryTable + ".transfer_doctor_id IS NOT NULL")
// 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {