wer

api/dao/orderProduct.go

@@ -25,7 +25,21 @@ func (r *OrderProductDao) GetOrderProductById(orderProductId int64) (m *model.Or
 
 // GetOrderProductPreloadById 获取药品订单数据-加载全部关联-药品订单id
 func (r *OrderProductDao) GetOrderProductPreloadById(orderProductId int64) (m *model.OrderProduct, err error) {
-	err = global.Db.Preload(clause.Associations).First(&m, orderProductId).Error
+	query := global.Db.Model(&model.OrderProduct{})
+
+	// 预加载所有关联
+	query = query.Preload(clause.Associations)
+
+	// 处方关联问诊表(抄方用)
+	query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
+			return db.Select("user_id", "user_name", "doctor_id")
+		}).Preload("TransferUserDoctor", func(db *gorm.DB) *gorm.DB {
+			return db.Select("user_id", "user_name", "doctor_id")
+		})
+	})
+
+	err = query.First(&m, orderProductId).Error
 	if err != nil {
 		return nil, err
 	}
@@ -132,7 +146,12 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
 
 	// 问诊订单
 	query = query.Preload("OrderInquiry", func(db *gorm.DB) *gorm.DB {
-		return db.Select("order_inquiry_id", "patient_name_mask", "patient_sex", "patient_age")
+		return db.Select("order_inquiry_id", "patient_name_mask", "patient_sex", "patient_age").
+			Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
+				return db.Select("user_id", "user_name", "doctor_id")
+			}).Preload("TransferUserDoctor", func(db *gorm.DB) *gorm.DB {
+				return db.Select("user_id", "user_name", "doctor_id")
+			})
 	})
 
 	// 患者名称