fix: fix listing of patient conditions

savannahghi · Sep 5, 2023 · 67472f4 · 67472f4
1 parent bef4132
commit 67472f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
diff --git 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,
 	}