5
This commit is contained in:
parent
7fc14a3642
commit
b450125512
@ -260,18 +260,21 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionTransferPageSearch(req reques
|
|||||||
prescriptionTable := (&model.OrderPrescription{}).TableName()
|
prescriptionTable := (&model.OrderPrescription{}).TableName()
|
||||||
inquiryTable := (&model.OrderInquiry{}).TableName()
|
inquiryTable := (&model.OrderInquiry{}).TableName()
|
||||||
doctorTable := (&model.UserDoctor{}).TableName()
|
doctorTable := (&model.UserDoctor{}).TableName()
|
||||||
userTable := (&model.User{}).TableName() // 新增
|
userTable := (&model.User{}).TableName()
|
||||||
|
|
||||||
// 构建查询条件
|
// 构建查询条件
|
||||||
query := global.Db.Model(&model.OrderPrescription{})
|
query := global.Db.Model(&model.OrderPrescription{})
|
||||||
|
|
||||||
// 关联问诊表,只查询TransferDoctorId不等于null的记录
|
// 关联问诊表,只查询TransferDoctorId不等于null的记录
|
||||||
query = query.Joins("INNER JOIN "+inquiryTable+" ON "+prescriptionTable+".order_inquiry_id = "+inquiryTable+".order_inquiry_id").
|
query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_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 + ".transfer_doctor_id = " + doctorTable + ".doctor_id")
|
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 {
|
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")
|
||||||
@ -435,7 +438,6 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionTransferPageSearch(req reques
|
|||||||
return m, totalRecords, nil
|
return m, totalRecords, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// GetOrderPrescriptionExportListSearch 获取抄方的处方列表-导出
|
// GetOrderPrescriptionExportListSearch 获取抄方的处方列表-导出
|
||||||
func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req requests.OrderPrescriptionExportList) (m []*model.OrderPrescription, err error) {
|
func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req requests.OrderPrescriptionExportList) (m []*model.OrderPrescription, err error) {
|
||||||
|
|
||||||
@ -446,8 +448,8 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req
|
|||||||
query := global.Db.Model(&model.OrderPrescription{})
|
query := global.Db.Model(&model.OrderPrescription{})
|
||||||
|
|
||||||
// 关联问诊表,只查询TransferDoctorId不等于null的记录
|
// 关联问诊表,只查询TransferDoctorId不等于null的记录
|
||||||
query = query.Joins("INNER JOIN "+inquiryTable+" ON "+prescriptionTable+".order_inquiry_id = "+inquiryTable+".order_inquiry_id").
|
query = query.Joins("INNER JOIN " + inquiryTable + " ON " + prescriptionTable + ".order_inquiry_id = " + inquiryTable + ".order_inquiry_id").
|
||||||
Where(inquiryTable+".transfer_doctor_id IS NOT NULL")
|
Where(inquiryTable + ".transfer_doctor_id IS NOT NULL")
|
||||||
|
|
||||||
// 患者表
|
// 患者表
|
||||||
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
|
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user