添加属性

api/controller/orderProduct.go

@@ -42,14 +42,6 @@ func (r *OrderProduct) GetOrderProductPage(c *gin.Context) {
 	orderProductDao := dao.OrderProductDao{}
 	orderProduct, total, err := orderProductDao.GetOrderProductPageSearch(req, req.Page, req.PageSize)
 
-	// 记录orderProduct数据到日志
-	global.Logger.WithFields(logrus.Fields{
-		"total":    total,
-		"page":     req.Page,
-		"pageSize": req.PageSize,
-	}).Info("获取药品订单列表数据")
-	utils.LogJsonInfo("orderProduct数据详情", orderProduct)
-
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return

api/dto/OrderProduct.go

@@ -59,6 +59,7 @@ type OrderProductDto struct {
 	UserDoctor            *UserDoctorDto            `json:"user_doctor"`             // 原始医生
 	InquiryDoctor         *UserDoctorDto            `json:"inquiry_doctor"`          // 问诊医生信息
 	TransferUserDoctor    *UserDoctorDto            `json:"transfer_prescription_doctor"`     // 接受抄方的医生（抄方处方医生信息）
+	IsTransferOrder       int                       `json:"is_transfer_order"`       // 是否为抄方订单
 	OrderPrescription     *OrderPrescriptionDto     `json:"order_prescription"`      // 处方数据
 	OrderInquiryCase      *OrderInquiryCaseDto      `json:"order_inquiry_case"`      // 问诊病例
 	OrderProductCoupon    *OrderProductCouponDto    `json:"order_product_coupon"`    // 优惠卷
@@ -187,6 +188,11 @@ func GetOrderProductListDto(m []*model.OrderProduct) []*OrderProductDto {
 				response = response.LoadInquiryDoctor(v.OrderInquiry.UserDoctor)
 			}
 
+			//加载问诊类型
+			if v.OrderInquiry != nil && v.OrderInquiry.UserDoctor != nil && v.OrderInquiry.TransferUserDoctor != nil {
+				response = response.LoadIsTransferOrder(v.OrderInquiry.UserDoctor, v.OrderInquiry.TransferUserDoctor)
+			}
+
 			// 加载接受抄方的医生信息
 			if v.OrderInquiry != nil && v.OrderInquiry.TransferUserDoctor != nil {
 				response = response.LoadTransferUserDoctor(v.OrderInquiry.TransferUserDoctor)
@@ -218,6 +224,7 @@ func (r *OrderProductDto) LoadDoctorName(m *model.UserDoctor) *OrderProductDto {
 	return r
 }
 
+
 // LoadUserDoctor 加载问诊医生信息
 func (r *OrderProductDto) LoadInquiryDoctor(m *model.UserDoctor) *OrderProductDto {
 	if m != nil {
@@ -226,6 +233,20 @@ func (r *OrderProductDto) LoadInquiryDoctor(m *model.UserDoctor) *OrderProductDt
 	return r
 }
 
+// LoadUserDoctor 加载问诊类型
+func (r *OrderProductDto) LoadIsTransferOrder(m *model.UserDoctor, n *model.UserDoctor) *OrderProductDto {
+	if m != nil && n != nil {
+		if(int(m.DoctorId) == int(n.DoctorId)){
+			r.IsTransferOrder = 1
+		}else{
+			r.IsTransferOrder = 0
+		}
+	}else{
+		r.IsTransferOrder = 0
+	}
+	return r
+}
+
 // LoadTransferUserDoctor 加载接受抄方的医生信息
 func (r *OrderProductDto) LoadTransferUserDoctor(m *model.UserDoctor) *OrderProductDto {
 	if m != nil {

api/service/orderProduct.go

@@ -81,6 +81,11 @@ func (r *OrderProductService) GetOrderProduct(orderProductId int64) (g *dto.Orde
 	// 加载问诊病例
 	g.LoadOrderInquiryCase(orderInquiryCase)
 
+	// 加载问诊类型
+	if orderProduct.OrderInquiry != nil && orderProduct.OrderInquiry.UserDoctor != nil && orderProduct.OrderInquiry.TransferUserDoctor != nil{
+		g.LoadIsTransferOrder(orderProduct.OrderInquiry.UserDoctor, orderProduct.OrderInquiry.TransferUserDoctor)
+	}
+
 	// 加载处方数据
 	g.LoadOrderPrescription(orderPrescription)