新增患者手机号

2023-09-12 09:56:27 +08:00
parent 3fcafc909a
commit a4255c5404
5 changed files with 54 additions and 7 deletions
@@ -87,11 +87,6 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
 		return db.Omit("open_id", "union_id", "wx_session_key")
 	})

-	// 问诊订单
-	query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB {
-		return db.Select("order_inquiry_id", "patient_name_mask", "patient_sex", "patient_age")
-	})
-
 	// 医生姓名
 	if req.DoctorName != "" {
 		subQuery := global.Db.Model(&model.UserDoctor{}).
@@ -101,6 +96,16 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
 		query = query.Where(gorm.Expr("doctor_id IN (?)", subQuery))
 	}

+	// 问诊订单
+	query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB {
+		return db.Select("order_inquiry_id", "patient_name_mask", "patient_sex", "patient_age")
+	})
+
+	// 患者名称
+	query = query.Preload("UserPatient.User", func(db *gorm.DB) *gorm.DB {
+		return db.Select("user_id", "user_name", "mobile")
+	})
+
 	// 患者姓名-就诊人
 	if req.PatientName != "" {
 		subQuery := global.Db.Model(&model.OrderInquiry{}).