23

2026-07-22 12:06:24 +08:00
parent 76c1c3b849
commit 613feb2dd0
4 changed files with 50 additions and 1 deletions
@@ -123,6 +123,12 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
 	// 构建查询条件
 	query := global.Db.Model(&model.OrderProduct{})

+	// 年度审查隐藏
+	if req.AnnualReviewHide != nil {
+		query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_product.order_inquiry_id")
+		query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
+	}
+
 	// 药品数据
 	query = query.Preload("OrderProductItem")

@@ -412,6 +418,12 @@ func (r *OrderProductDao) GetOrderProductExportListSearch(req requests.OrderProd
 	// 构建查询条件
 	query := global.Db.Model(&model.OrderProduct{})

+	// 年度审查隐藏
+	if req.AnnualReviewHide != nil {
+		query = query.Joins("JOIN gdxz_order_inquiry ON gdxz_order_inquiry.order_inquiry_id = gdxz_order_product.order_inquiry_id")
+		query = query.Where("gdxz_order_inquiry.annual_review_hide = ?", req.AnnualReviewHide)
+	}
+
 	// 医生
 	query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
 		return db.Omit("open_id", "union_id", "wx_session_key")