fix: list patient compositions (#423)

Signed-off-by: Kathurima Kimathi <kathurimakimathi415@gmail.com>
savannahghi · Apr 11, 2024 · 4232aca · 4232aca
1 parent 4e1974a
commit 4232aca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkg/clinical/usecases/clinical/composition.go b/pkg/clinical/usecases/clinical/composition.go
@@ -203,16 +203,22 @@ func mapFHIRCompositionToCompositionDTO(composition domain.FHIRComposition) *dto
 
 	output := dto.Composition{
 		ID:          *composition.ID,
-		Text:        string(composition.Section[0].Text.Div),
 		Type:        dto.CompositionType(composition.Type.Text),
-		Category:    dto.CompositionCategory(composition.Category[0].Text),
 		Status:      dto.CompositionStatusEnum(*composition.Status),
 		PatientID:   *composition.Subject.ID,
 		EncounterID: *composition.Encounter.ID,
 		Date:        composition.Date,
 		Section:     compositionSection,
 	}
 
+	if len(composition.Section) != 0 {
+		output.Text = string(composition.Section[0].Text.Div)
+	}
+
+	if len(composition.Category) != 0 {
+		output.Category = dto.CompositionCategory(composition.Category[0].Text)
+	}
+
 	return &dto.CompositionConnection{
 		TotalCount: 0,
 		Edges: []dto.CompositionEdge{

diff --git a/pkg/clinical/usecases/clinical/encounter.go b/pkg/clinical/usecases/clinical/encounter.go
@@ -138,6 +138,18 @@ func (c *UseCasesClinicalImpl) CreateInitialComposition(ctx context.Context,
 			},
 			Text: compositionConcept.CompositionTypeConcept.DisplayName,
 		},
+		Category: []*domain.FHIRCodeableConceptInput{
+			{
+				Coding: []*domain.FHIRCodingInput{
+					{
+						System:  (*scalarutils.URI)(&compositionConcept.CompositionCategoryConcept.URL),
+						Code:    scalarutils.Code(compositionConcept.CompositionCategoryConcept.ID),
+						Display: compositionConcept.CompositionCategoryConcept.DisplayName,
+					},
+				},
+				Text: compositionConcept.CompositionCategoryConcept.DisplayName,
+			},
+		},
 		Subject: &domain.FHIRReferenceInput{
 			ID:        episodeOfCare.Resource.Patient.ID,
 			Reference: episodeOfCare.Resource.Patient.Reference,