diff --git a/api/dto/OrderInquiry.go b/api/dto/OrderInquiry.go index 67b2ab2..fa2e773 100644 --- a/api/dto/OrderInquiry.go +++ b/api/dto/OrderInquiry.go @@ -178,10 +178,10 @@ func (r *OrderInquiryDto) LoadOrderInquiryCoupon(m *model.OrderInquiryCoupon) *O return r } -// LoadOrderInquiryCase 加载问诊病例 -func (r *OrderInquiryDto) LoadOrderInquiryCase(m *model.OrderInquiryCase) *OrderInquiryDto { +// LoadMaskOrderInquiryCase 加载问诊病例 +func (r *OrderInquiryDto) LoadMaskOrderInquiryCase(m *model.OrderInquiryCase) *OrderInquiryDto { if m != nil { - d := GetOrderInquiryCaseDto(m) + d := GetMaskOrderInquiryCaseDto(m) r.OrderInquiryCase = d } diff --git a/api/dto/OrderInquiryCase.go b/api/dto/OrderInquiryCase.go index 4f80f58..b756891 100644 --- a/api/dto/OrderInquiryCase.go +++ b/api/dto/OrderInquiryCase.go @@ -88,6 +88,27 @@ func GetOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { } } +func GetMaskOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { + return &OrderInquiryCaseDto{ + InquiryCaseId: fmt.Sprintf("%d", m.InquiryCaseId), + UserId: fmt.Sprintf("%d", m.InquiryCaseId), + PatientId: fmt.Sprintf("%d", m.InquiryCaseId), + OrderInquiryId: fmt.Sprintf("%d", m.InquiryCaseId), + FamilyId: fmt.Sprintf("%d", m.InquiryCaseId), + Relation: m.Relation, + Status: m.Status, + Name: utils.MaskNameStr(m.Name, 0), + Sex: m.Sex, + Age: m.Age, + DiseaseClassId: fmt.Sprintf("%d", m.InquiryCaseId), + DiseaseClassName: m.DiseaseClassName, + DiagnosisDate: m.DiagnosisDate, + DiseaseDesc: m.DiseaseDesc, + CreatedAt: m.CreatedAt, + UpdatedAt: m.UpdatedAt, + } +} + func GetOrderInquiryCaseListDto(m []*model.OrderInquiryCase) []OrderInquiryCaseDto { // 处理返回值 responses := make([]OrderInquiryCaseDto, len(m)) diff --git a/api/dto/OrderPrescription.go b/api/dto/OrderPrescription.go index 9a29871..7af70e7 100644 --- a/api/dto/OrderPrescription.go +++ b/api/dto/OrderPrescription.go @@ -178,10 +178,10 @@ func (r *OrderPrescriptionDto) LoadOrderPrescriptionIcdString(m []*model.OrderPr return r } -// LoadOrderInquiryCase 加载问诊病例 -func (r *OrderPrescriptionDto) LoadOrderInquiryCase(m *model.OrderInquiryCase) *OrderPrescriptionDto { +// LoadMaskOrderInquiryCase 加载问诊病例 +func (r *OrderPrescriptionDto) LoadMaskOrderInquiryCase(m *model.OrderInquiryCase) *OrderPrescriptionDto { if m != nil { - d := GetOrderInquiryCaseDto(m) + d := GetMaskOrderInquiryCaseDto(m) r.OrderInquiryCase = d } diff --git a/api/model/orderPrescription.go b/api/model/orderPrescription.go index 578696f..d162ea8 100644 --- a/api/model/orderPrescription.go +++ b/api/model/orderPrescription.go @@ -24,7 +24,6 @@ type OrderPrescription struct { IsAutoPharVerify int `gorm:"column:is_auto_phar_verify;type:tinyint(1);default:0;comment:是否药师自动审核(0:否 1:是)" json:"is_auto_phar_verify"` DoctorCreatedTime LocalTime `gorm:"column:doctor_created_time;type:datetime;comment:医生开具处方时间" json:"doctor_created_time"` ExpiredTime LocalTime `gorm:"column:expired_time;type:datetime;comment:处方过期时间" json:"expired_time"` - VoidTime LocalTime `gorm:"column:void_time;type:datetime;comment:处方作废时间" json:"void_time"` IsDelete int `gorm:"column:is_delete;type:tinyint(1);default:0;comment:是否删除(0:否 1:是)" json:"is_delete"` PrescriptionCode string `gorm:"column:prescription_code;type:varchar(255);comment:处方编号" json:"prescription_code"` DoctorName string `gorm:"column:doctor_name;type:varchar(100);comment:医生名称" json:"doctor_name"` diff --git a/api/service/OrderInquiry.go b/api/service/OrderInquiry.go index 5917e29..bb7a399 100644 --- a/api/service/OrderInquiry.go +++ b/api/service/OrderInquiry.go @@ -316,7 +316,7 @@ func (r *OrderInquiryService) GetOrderInquiry(orderInquiryId int64) (g *dto.Orde g.LoadOrderInquiryCoupon(orderInquiryCoupon) // 加载问诊病例 - g.LoadOrderInquiryCase(orderInquiryCase) + g.LoadMaskOrderInquiryCase(orderInquiryCase) // 加载订单评价 g.LoadOrderEvaluation(orderEvaluation) diff --git a/api/service/orderPrescription.go b/api/service/orderPrescription.go index 37c98a2..847ee0d 100644 --- a/api/service/orderPrescription.go +++ b/api/service/orderPrescription.go @@ -57,7 +57,7 @@ func (r *OrderPrescriptionService) GetOrderPrescription(OrderPrescriptionId int6 g = dto.GetOrderPrescriptionDto(orderPrescription) // 加载问诊病例 - g.LoadOrderInquiryCase(orderInquiryCase) + g.LoadMaskOrderInquiryCase(orderInquiryCase) // 加载处方关联疾病-字符串 g.LoadOrderPrescriptionIcdString(orderPrescriptionIcds)