correctly handle complex Observations (ComponentValueQuantity - used …

…by Blood Pressure - Diastolic vs Systolic)
fastenhealth · Mar 3, 2024 · 181d8a7 · 181d8a7
1 parent e12d48c
commit 181d8a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/backend/pkg/utils/ips/templates/includes/observation-unit.gohtml b/backend/pkg/utils/ips/templates/includes/observation-unit.gohtml
@@ -6,4 +6,6 @@
     {{.ValueDate | date "2006-01-02" }}
 {{else if not (empty (.ValueConcept | parseList)) }}
     {{.ValueConcept}}
+{{else if not (empty (.ComponentValueQuantity | parseList)) }}
+    {{.ComponentValueQuantity | parseList | pluckList "unit" | join "," }}
 {{end}}
diff --git a/backend/pkg/utils/ips/templates/includes/observation-value.gohtml b/backend/pkg/utils/ips/templates/includes/observation-value.gohtml
@@ -9,4 +9,15 @@
     {{.entry.ValueDate | date "2006-01-02" }}
 {{else if not (empty (.entry.ValueConcept | parseList)) }}
     {{.entry.ValueConcept}}
+{{else if not (empty (.entry.ComponentValueQuantity | parseList)) }}
+    {{$componentCodeText := $.entry.ComponentCode | parseList | pluckList "text" }}
+    {{$componentValueQuantity := $.entry.ComponentValueQuantity | parseList | pluckList "value" | roundList 2 }}
+
+    {{range $index, $text := $componentCodeText }}
+        {{$text}} - {{index $componentValueQuantity $index}}
+    {{end}}
+
+    {{if (get . "include_unit")}}
+    {{.ComponentValueQuantity | parseList | pluckList "unit" | join "," }}
+    {{end}}
 {{end}}