From a206ea46af70bb977dcd764f9b6469a8eecc2a54 Mon Sep 17 00:00:00 2001 From: EspiraMarvin Date: Wed, 6 Sep 2023 12:13:01 +0300 Subject: [PATCH] fix: fix listing of patient conditions (#278) --- pkg/clinical/application/dto/condition_output.go | 2 +- pkg/clinical/presentation/graph/generated/generated.go | 4 ++-- pkg/clinical/usecases/clinical/condition.go | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/clinical/application/dto/condition_output.go b/pkg/clinical/application/dto/condition_output.go index c13d3fa7..6e8c4a42 100644 --- a/pkg/clinical/application/dto/condition_output.go +++ b/pkg/clinical/application/dto/condition_output.go @@ -13,7 +13,7 @@ type Condition struct { Category ConditionCategory `json:"category"` OnsetDate *scalarutils.Date `json:"onsetDate"` - RecordedDate scalarutils.Date `json:"recordedDate"` + RecordedDate *scalarutils.Date `json:"recordedDate"` Note string `json:"note"` diff --git a/pkg/clinical/presentation/graph/generated/generated.go b/pkg/clinical/presentation/graph/generated/generated.go index b350894b..cd24da1d 100644 --- a/pkg/clinical/presentation/graph/generated/generated.go +++ b/pkg/clinical/presentation/graph/generated/generated.go @@ -3887,9 +3887,9 @@ func (ec *executionContext) _Condition_recordedDate(ctx context.Context, field g if resTmp == nil { return graphql.Null } - res := resTmp.(scalarutils.Date) + res := resTmp.(*scalarutils.Date) fc.Result = res - return ec.marshalODate2githubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, field.Selections, res) + return ec.marshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Condition_recordedDate(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { diff --git a/pkg/clinical/usecases/clinical/condition.go b/pkg/clinical/usecases/clinical/condition.go index 8cf70ffb..4980d718 100644 --- a/pkg/clinical/usecases/clinical/condition.go +++ b/pkg/clinical/usecases/clinical/condition.go @@ -153,8 +153,6 @@ func mapFHIRConditionToConditionDTO(condition domain.FHIRCondition) *dto.Conditi category = "problem-list-item" case string(dto.ConditionCategoryDiagnosis): category = "encounter-diagnosis" - default: - return nil } output := dto.Condition{ @@ -164,7 +162,7 @@ func mapFHIRConditionToConditionDTO(condition domain.FHIRCondition) *dto.Conditi Code: string(condition.Code.Coding[0].Code), System: string(*condition.Code.Coding[0].System), Category: dto.ConditionCategory(category), - RecordedDate: *condition.RecordedDate, + RecordedDate: condition.RecordedDate, PatientID: *condition.Subject.ID, EncounterID: *condition.Encounter.ID, }