RT-1327:(charts-on-fhir) Observation mapper creates multiple layers (#…

…247)
elimuinformatics · May 24, 2024 · 6c6dc61 · 6c6dc61
1 parent 2e9d9a6
commit 6c6dc61
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/libs/ngx-charts-on-fhir/package.json b/libs/ngx-charts-on-fhir/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elimuinformatics/ngx-charts-on-fhir",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "Charts-on-FHIR: A data visualization library for SMART-on-FHIR healthcare applications",
   "license": "Apache-2.0",
   "homepage": "https://elimuinformatics.github.io/charts-on-fhir",

diff --git a/...rts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.spec.ts b/...rts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.spec.ts
@@ -155,7 +155,7 @@ describe('ComponentObservationMapper', () => {
         resourceType: 'Observation',
         status: 'final',
         code: { text: 'text' },
-        category: [{ coding: [{ display: 'A' }] }, { coding: [{ display: 'B' }] }],
+        category: [{ coding: [{ code: 'A' }] }, { coding: [{ code: 'B' }] }],
         effectiveDateTime: new Date().toISOString(),
         component: [
           {

diff --git a/...x-charts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.ts b/...x-charts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.ts
@@ -58,7 +58,7 @@ export class ComponentObservationMapper implements Mapper<ComponentObservation>
     const layerName = overrideLayerName ?? codeName;
     return {
       name: layerName,
-      category: resource.category?.flatMap((c) => c.coding?.map((coding) => coding.display)).filter(isDefined),
+      category: resource.category?.flatMap((c) => c.coding?.map((coding) => coding.code)).filter(isDefined),
       datasets: resource.component.map((component) => ({
         label: this.codeService.getName(component.code, resource) + getMeasurementSettingSuffix(resource),
         yAxisID: layerName,

diff --git a/...charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.spec.ts b/...charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.spec.ts
@@ -111,7 +111,7 @@ describe('SimpleObservationMapper', () => {
         resourceType: 'Observation',
         status: 'final',
         code: { text: 'text' },
-        category: [{ coding: [{ display: 'A' }] }, { coding: [{ display: 'B' }] }],
+        category: [{ coding: [{ code: 'A' }] }, { coding: [{ code: 'B' }] }],
         effectiveDateTime: new Date().toISOString(),
         valueQuantity: { value: 7, unit: 'unit' },
       };

diff --git a/.../ngx-charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.ts b/.../ngx-charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.ts
@@ -49,7 +49,7 @@ export class SimpleObservationMapper implements Mapper<SimpleObservation> {
     const layerName = overrideLayerName ?? codeName;
     return {
       name: layerName,
-      category: resource.category?.flatMap((c) => c.coding?.map((coding) => coding.display)).filter(isDefined),
+      category: resource.category?.flatMap((c) => c.coding?.map((coding) => coding.code)).filter(isDefined),
       datasets: [
         {
           label: codeName + getMeasurementSettingSuffix(resource),