diff --git a/api/dto/OrderInquiryCase.go b/api/dto/OrderInquiryCase.go index ef6fe1e..4f2c4b1 100644 --- a/api/dto/OrderInquiryCase.go +++ b/api/dto/OrderInquiryCase.go @@ -5,7 +5,6 @@ import ( "hospital-admin-api/api/dao" "hospital-admin-api/api/model" "hospital-admin-api/utils" - "strings" ) type OrderInquiryCaseDto struct { @@ -25,7 +24,7 @@ type OrderInquiryCaseDto struct { DiseaseClassName string `json:"disease_class_name"` // 疾病名称-系统 DiagnosisDate model.LocalTime `json:"diagnosis_date"` // 确诊日期 DiseaseDesc string `json:"disease_desc"` // 病情描述(主诉) - DiagnoseImages []string `json:"diagnose_images"` // 复诊凭证(多个使用逗号分隔) + DiagnoseImages string `json:"diagnose_images"` // 复诊凭证(多个使用逗号分隔) IsAllergyHistory *int `json:"is_allergy_history"` // 是否存在过敏史(0:否 1:是) AllergyHistory string `json:"allergy_history"` // 过敏史描述 IsFamilyHistory *int `json:"is_family_history"` // 是否存在家族病史(0:否 1:是) @@ -48,15 +47,6 @@ type OrderInquiryCaseDto struct { } func GetOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { - // 复诊凭证 - var diagnoseImages []string - if m.DiagnoseImages != "" { - results := strings.Split(m.DiagnoseImages, ",") - for _, result := range results { - diagnoseImages = append(diagnoseImages, utils.AddOssDomain(result)) - } - } - return &OrderInquiryCaseDto{ InquiryCaseId: fmt.Sprintf("%d", m.InquiryCaseId), UserId: fmt.Sprintf("%d", m.InquiryCaseId), @@ -74,7 +64,7 @@ func GetOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { DiseaseClassName: m.DiseaseClassName, DiagnosisDate: m.DiagnosisDate, DiseaseDesc: m.DiseaseDesc, - DiagnoseImages: diagnoseImages, + DiagnoseImages: m.DiagnoseImages, IsAllergyHistory: m.IsAllergyHistory, AllergyHistory: m.AllergyHistory, IsFamilyHistory: m.IsFamilyHistory, @@ -88,16 +78,6 @@ func GetOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { } func GetMaskOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto { - // 复诊凭证 - var diagnoseImages []string - - if m.DiagnoseImages != "" { - results := strings.Split(m.DiagnoseImages, ",") - for _, result := range results { - diagnoseImages = append(diagnoseImages, utils.AddOssDomain(result)) - } - } - return &OrderInquiryCaseDto{ InquiryCaseId: fmt.Sprintf("%d", m.InquiryCaseId), UserId: fmt.Sprintf("%d", m.InquiryCaseId), @@ -113,7 +93,7 @@ func GetMaskOrderInquiryCaseDto(m *model.OrderInquiryCase) *OrderInquiryCaseDto DiseaseClassName: m.DiseaseClassName, DiagnosisDate: m.DiagnosisDate, DiseaseDesc: m.DiseaseDesc, - DiagnoseImages: diagnoseImages, + DiagnoseImages: m.DiagnoseImages, CreatedAt: m.CreatedAt, UpdatedAt: m.UpdatedAt, }