新增药品订单详情

2023-09-11 15:11:23 +08:00
parent 0a51e0fcbc
commit 21812f4e96
4 changed files with 72 additions and 6 deletions
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/responses/orderInquiryCaseResponse"
+	"hospital-admin-api/utils"
 	"strconv"
 )

@@ -26,7 +27,7 @@ func (r *OrderInquiryCaseService) GetOrderInquiryCaseByOrderInquiryId(orderInqui
 		FamilyId:         strconv.FormatInt(orderInquiryCase.FamilyId, 10),
 		Relation:         orderInquiryCase.Relation,
 		Status:           orderInquiryCase.Status,
-		Name:             orderInquiryCase.Name,
+		Name:             utils.MaskNameStr(orderInquiryCase.Name, 1),
 		Sex:              orderInquiryCase.Sex,
 		Age:              orderInquiryCase.Age,
 		Height:           orderInquiryCase.Height,
@@ -84,9 +84,9 @@ func (r *OrderProductService) GetOrderProduct(orderProductId int64) (getOrderPro
 		PayTime:               orderProduct.PayTime,
 		Remarks:               orderProduct.Remarks,
 		RefundStatus:          orderProduct.RefundStatus,
+		CancelTime:            orderProduct.CancelTime,
+		CancelRemarks:         orderProduct.CancelRemarks,
 		ReportPreStatus:       orderProduct.ReportPreStatus,
-		ConsigneeNameMask:     orderProduct.ConsigneeNameMask,
-		ConsigneeTelMask:      orderProduct.ConsigneeTelMask,
 		CreatedAt:             orderProduct.CreatedAt,
 		UpdatedAt:             orderProduct.UpdatedAt,
 		OrderProductRefund:    orderProductRefund,