From 16615530de21a90a0c4947711a46cb7c7457f4cc Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 14 Sep 2023 14:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/responses/orderProductResponse/orderProduct.go | 2 ++ api/service/orderInquiryCase.go | 3 +-- api/service/orderProduct.go | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/responses/orderProductResponse/orderProduct.go b/api/responses/orderProductResponse/orderProduct.go index ac8b017..43791da 100644 --- a/api/responses/orderProductResponse/orderProduct.go +++ b/api/responses/orderProductResponse/orderProduct.go @@ -72,6 +72,8 @@ type GetOrderProduct struct { CancelTime model.LocalTime `json:"cancel_time"` // 订单取消时间 CancelRemarks string `json:"cancel_remarks"` // 订单取消备注（自动添加） ReportPreStatus int `json:"report_pre_status"` // 上报处方平台状态（0:未上报 1:已上报 2:上报失败）） + ReportPreTime model.LocalTime `json:"report_pre_time"` // 上报处方平台时间 + ReportPreFailReason string `json:"report_pre_fail_reason"` // 上报失败原因 ProvinceId int `json:"province_id"` // 省份id Province string `json:"province"` // 省份 CityId int `json:"city_id"` // 城市id diff --git a/api/service/orderInquiryCase.go b/api/service/orderInquiryCase.go index 6f9cf87..0179ed7 100644 --- a/api/service/orderInquiryCase.go +++ b/api/service/orderInquiryCase.go @@ -4,7 +4,6 @@ import ( "errors" "hospital-admin-api/api/dao" "hospital-admin-api/api/responses/orderInquiryCaseResponse" - "hospital-admin-api/utils" "strconv" ) @@ -27,7 +26,7 @@ func (r *OrderInquiryCaseService) GetOrderInquiryCaseByOrderInquiryId(orderInqui FamilyId: strconv.FormatInt(orderInquiryCase.FamilyId, 10), Relation: orderInquiryCase.Relation, Status: orderInquiryCase.Status, - Name: utils.MaskNameStr(orderInquiryCase.Name, 1), + Name: orderInquiryCase.Name, Sex: orderInquiryCase.Sex, Age: orderInquiryCase.Age, Height: orderInquiryCase.Height, diff --git a/api/service/orderProduct.go b/api/service/orderProduct.go index a4d8fff..bc3988f 100644 --- a/api/service/orderProduct.go +++ b/api/service/orderProduct.go @@ -94,6 +94,8 @@ func (r *OrderProductService) GetOrderProduct(orderProductId int64) (getOrderPro CancelTime: orderProduct.CancelTime, CancelRemarks: orderProduct.CancelRemarks, ReportPreStatus: orderProduct.ReportPreStatus, + ReportPreTime: orderProduct.ReportPreTime, + ReportPreFailReason: orderProduct.ReportPreFailReason, ProvinceId: orderProduct.ProvinceId, Province: orderProduct.Province, CityId: orderProduct.CityId,