chore: add 'ValueExpression' to extension

savannahghi · Jan 31, 2024 · 808e605 · 808e605
1 parent d84b415
commit 808e605
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/pkg/clinical/application/dto/input.go b/pkg/clinical/application/dto/input.go
@@ -211,3 +211,14 @@ type Reference struct {
 	Identifier Identifier      `json:"identifier,omitempty"`
 	Display    string          `json:"display,omitempty"`
 }
+
+// Expression is documented here http://hl7.org/fhir/StructureDefinition/Expression
+type Expression struct {
+	ID          *string     `bson:"id,omitempty" json:"id,omitempty"`
+	Extension   []Extension `bson:"extension,omitempty" json:"extension,omitempty"`
+	Description *string     `bson:"description,omitempty" json:"description,omitempty"`
+	Name        *string     `bson:"name,omitempty" json:"name,omitempty"`
+	Language    string      `bson:"language" json:"language"`
+	Expression  *string     `bson:"expression,omitempty" json:"expression,omitempty"`
+	Reference   *string     `bson:"reference,omitempty" json:"reference,omitempty"`
+}
diff --git a/pkg/clinical/application/dto/questionnaire_output.go b/pkg/clinical/application/dto/questionnaire_output.go
@@ -104,6 +104,7 @@ type Extension struct {
 	ValuePeriod          *Period          `json:"valuePeriod,omitempty"`
 	ValueRatio           *Ratio           `json:"valueRatio,omitempty"`
 	ValueReference       *Reference       `json:"valueReference,omitempty"`
+	ValueExpression      *Expression      `json:"valueExpression,omitempty"`
 }
 
 // Annotation is a resources annotation

diff --git a/pkg/clinical/domain/complex_types.go b/pkg/clinical/domain/complex_types.go
@@ -991,6 +991,17 @@ type FHIRTimingRepeatInput struct {
 	Offset *int `json:"offset,omitempty"`
 }
 
+// FHIRExpression is documented here http://hl7.org/fhir/StructureDefinition/Expression
+type FHIRExpression struct {
+	ID          *string     `bson:"id,omitempty" json:"id,omitempty"`
+	Extension   []Extension `bson:"extension,omitempty" json:"extension,omitempty"`
+	Description *string     `bson:"description,omitempty" json:"description,omitempty"`
+	Name        *string     `bson:"name,omitempty" json:"name,omitempty"`
+	Language    string      `bson:"language" json:"language"`
+	Expression  *string     `bson:"expression,omitempty" json:"expression,omitempty"`
+	Reference   *string     `bson:"reference,omitempty" json:"reference,omitempty"`
+}
+
 // AddressTypeEnum is a FHIR enum
 type AddressTypeEnum string
 

diff --git a/pkg/clinical/domain/extension.go b/pkg/clinical/domain/extension.go
@@ -31,6 +31,7 @@ type Extension struct {
 	ValuePeriod          *FHIRPeriod          `json:"valuePeriod,omitempty"`
 	ValueRatio           *FHIRRatio           `json:"valueRatio,omitempty"`
 	ValueReference       *FHIRReference       `json:"valueReference,omitempty"`
+	ValueExpression      *FHIRExpression      `json:"valueExpression,omitempty"`
 }
 
 // FHIRExtension contains child elements to represent additional information that is not part of the basic definition of the resource.