This commit is contained in:
wucongxing 2023-11-16 16:00:54 +08:00
parent ada4339add
commit 7bd3fd2cc7

View File

@ -1241,7 +1241,6 @@ func (r *ExportService) PatientFamily(d []*model.PatientFamily) (string, error)
for _, v := range d { for _, v := range d {
data := PatientFamilyData{ data := PatientFamilyData{
CardName: v.CardName, CardName: v.CardName,
Relation: utils.RelationToString(*v.Relation),
Status: utils.PatientFamilyStatusToString(v.Status), Status: utils.PatientFamilyStatusToString(v.Status),
IsDefault: utils.IsDefaultToString(v.IsDefault), IsDefault: utils.IsDefaultToString(v.IsDefault),
Type: utils.CardTypeToString(v.Type), Type: utils.CardTypeToString(v.Type),
@ -1258,6 +1257,10 @@ func (r *ExportService) PatientFamily(d []*model.PatientFamily) (string, error)
JobName: v.JobName, JobName: v.JobName,
} }
if v.Relation != nil {
data.Relation = utils.RelationToString(*v.Relation)
}
if v.UserPatient != nil { if v.UserPatient != nil {
data.UserName = v.UserPatient.UserName data.UserName = v.UserPatient.UserName
if v.UserPatient.User != nil { if v.UserPatient.User != nil {