diff --git a/api/dto/OrderServicePackage.go b/api/dto/OrderServicePackage.go index 2de95e5..a32aa5b 100644 --- a/api/dto/OrderServicePackage.go +++ b/api/dto/OrderServicePackage.go @@ -65,6 +65,7 @@ type OrderServicePackageDetailInfoDto struct { OrderProduct []*OrderProductDto `json:"order_product"` // 关联商品订单 OrderInquiry []*OrderInquiryDto `json:"order_inquiry"` // 关联问诊订单 UserCoupon []*UserCouponDto `json:"user_coupon"` // 关联优惠卷 + OrderServicePackageCase *OrderServicePackageCaseDto `json:"order_service_package_case"` // 关联病例 OrderServicePackageDetail *OrderServicePackageDetailDto `json:"order_service_package_detail"` // 服务包订单详情 CurrentMonthStartDate string `json:"current_month_start_date"` // 当月开始时间 CurrentMonthFinishDate string `json:"current_month_finish_date"` // 当月结束时间 @@ -286,3 +287,13 @@ func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageDetail(m *mode } return r } + +// LoadOrderServicePackageCase 加载服务包订单关联病例数据 +func (r *OrderServicePackageDetailInfoDto) LoadOrderServicePackageCase(m *model.OrderServicePackageCase) *OrderServicePackageDetailInfoDto { + if m != nil { + d := GetOrderServicePackageCaseDto(m) + + r.OrderServicePackageCase = d + } + return r +} diff --git a/api/service/orderServicePackage.go b/api/service/orderServicePackage.go index dc58b40..9ebff55 100644 --- a/api/service/orderServicePackage.go +++ b/api/service/orderServicePackage.go @@ -74,6 +74,13 @@ func (r *OrderServicePackageService) GetOrderServicePackageDetailInfo(orderServi return nil, errors.New(err.Error()) } + // 获取关联病例 + orderServicePackageCaseDao := dao.OrderServicePackageCaseDao{} + orderServicePackageCase, err := orderServicePackageCaseDao.GetOrderServicePackageCaseByOrderId(orderServicePackage.OrderId) + if err != nil || orderServicePackageDetail == nil { + return nil, errors.New(err.Error()) + } + // 处理返回值 g = dto.GetOrderServicePackageDetailInfoDto(orderServicePackage) @@ -85,6 +92,9 @@ func (r *OrderServicePackageService) GetOrderServicePackageDetailInfo(orderServi // 加载服务包订单详情数据 g.LoadOrderServicePackageDetail(orderServicePackageDetail) + // 加载服务包订单关联病例数据 + g.LoadOrderServicePackageCase(orderServicePackageCase) + // 获取服务包当前月时间区间 CurrentMonthStartDate, CurrentMonthFinishDate, err := r.getOrderServicePackageCurrentMonthDate(g.StartTime) g.CurrentMonthStartDate = CurrentMonthStartDate.Format("2006年01月02日 15时04分")