This commit is contained in:
haomingming
2026-07-22 13:58:57 +08:00
parent 613feb2dd0
commit d1e3e6223b
4 changed files with 73 additions and 0 deletions
+17
View File
@@ -94,6 +94,12 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionPageSearch(req requests.GetOr
// 构建查询条件
query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_prescription.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key")
@@ -450,6 +456,11 @@ func (r *OrderPrescriptionDao) GetOrderTransferPrescriptionExportListSearch(req
// 构建查询条件
query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Where(inquiryTable + ".annual_review_hide = ?", req.AnnualReviewHide)
}
// 关联问诊表,只查询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")
@@ -644,6 +655,12 @@ func (r *OrderPrescriptionDao) GetOrderPrescriptionExportListSearch(req requests
// 构建查询条件
query := global.Db.Model(&model.OrderPrescription{})
// 年度审查隐藏
if req.AnnualReviewHide != nil {
query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_prescription.order_inquiry_id")
query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
}
// 患者表
query = query.Preload("UserPatient", func(db *gorm.DB) *gorm.DB {
return db.Omit("open_id", "union_id", "wx_session_key")