Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the observation mapper to use valueQuantity.code #248

Merged
merged 5 commits into from
Jun 4, 2024
Merged

Updated the observation mapper to use valueQuantity.code #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd14ecc
Updated the data layer merge service to create hashcode using layer name
ShubhamParikh9 May 31, 2024
e21642f
Updated the component observation mapper to use valueQuantity.code
ShubhamParikh9 Jun 3, 2024
bfba416
Updated the unit test case
ShubhamParikh9 Jun 3, 2024
790a988
Updated the code as suggested on PR
ShubhamParikh9 Jun 3, 2024
fe73ccd
Merge branch 'main' of https://github.com/elimuinformatics/charts-on-…
ShubhamParikh9 Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ngx-charts-on-fhir/src/lib/fhir-mappers/observation/blood-pressure-mapper.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('BloodPressureMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand All @@ -46,7 +46,7 @@ describe('BloodPressureMapper', () => {
component: [
{
code: { text: '' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand All @@ -64,11 +64,11 @@ describe('BloodPressureMapper', () => {
component: [
{
code: { coding: [{ system: 'http://loinc.org', code: '8480-6' }], text: 'Systolic' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
{
code: { coding: [{ system: 'http://loinc.org', code: '8462-4' }], text: 'Diastolic' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand Down
22 changes: 11 additions & 11 deletions ...rts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand Down Expand Up @@ -52,11 +52,11 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'one' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
{
code: { text: 'two' },
valueQuantity: { value: 8, unit: 'unit' },
valueQuantity: { value: 8, unit: 'unit', code: 'code' },
},
],
};
Expand All @@ -76,7 +76,7 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand All @@ -92,14 +92,14 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
expect(mapper.map(observation).datasets[0].data[0].y).toEqual(7);
});

it('should map valueQuantity.unit to the title of a linear scale', () => {
it('should map valueQuantity.code to the title of a linear scale', () => {
const observation: ComponentObservation = {
resourceType: 'Observation',
status: 'final',
Expand All @@ -108,15 +108,15 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
expect(mapper.map(observation).scale).toEqual(
jasmine.objectContaining({
id: 'text',
type: 'linear',
title: { text: ['text', 'unit'] },
title: { text: ['text', 'code'] },
})
);
});
Expand All @@ -130,7 +130,7 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
referenceRange: [
{
low: { value: 1 },
Expand Down Expand Up @@ -160,7 +160,7 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand All @@ -176,7 +176,7 @@ describe('ComponentObservationMapper', () => {
component: [
{
code: { text: 'component' },
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
},
],
};
Expand Down
4 changes: 3 additions & 1 deletion ...x-charts-on-fhir/src/lib/fhir-mappers/observation/component-observation-mapper.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export type ComponentObservation = {
valueQuantity: {
value: number;
unit: string;
code: string;
};
} & ObservationComponent)[];
} & Observation;
Expand All @@ -37,6 +38,7 @@ export function isComponentObservation(resource: Observation): resource is Compo
c.code.text &&
c.valueQuantity?.value &&
c.valueQuantity?.unit &&
c.valueQuantity?.code &&
// all components must have the same units of measure
c.valueQuantity.unit === resource?.component?.[0].valueQuantity?.unit
)
Expand Down Expand Up @@ -81,7 +83,7 @@ export class ComponentObservationMapper implements Mapper<ComponentObservation>
})),
scale: merge({}, this.linearScaleOptions, {
id: layerName,
title: { text: [layerName, resource.component[0].valueQuantity.unit] },
title: { text: [layerName, resource.component[0].valueQuantity.code] },
semicolin marked this conversation as resolved.
Show resolved Hide resolved
stackWeight: resource.component.length,
}),
annotations: resource.component
Expand Down
20 changes: 10 additions & 10 deletions ...charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect(mapper.canMap(observation)).toBe(true);
});
Expand All @@ -51,7 +51,7 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: date.toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect(mapper.map(observation).datasets[0].data[0].x).toEqual(date.getTime());
});
Expand All @@ -62,23 +62,23 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect(mapper.map(observation).datasets[0].data[0].y).toEqual(7);
});

it('should map valueQuantity.unit to the title of a linear scale', () => {
it('should map valueQuantity.code to the title of a linear scale', () => {
const observation: SimpleObservation = {
resourceType: 'Observation',
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect(mapper.map(observation).scale).toEqual({
id: 'text',
type: 'linear',
title: { text: ['text', 'unit'] },
title: { text: ['text', 'code'] },
});
});

Expand All @@ -88,7 +88,7 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
referenceRange: [
{
low: { value: 1 },
Expand All @@ -113,7 +113,7 @@ describe('SimpleObservationMapper', () => {
code: { text: 'text' },
category: [{ coding: [{ code: 'A' }] }, { coding: [{ code: 'B' }] }],
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect(mapper.map(observation).category).toEqual(['A', 'B']);
});
Expand All @@ -124,7 +124,7 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
extension: [
{
url: measurementSettingExtUrl,
Expand All @@ -143,7 +143,7 @@ describe('SimpleObservationMapper', () => {
status: 'final',
code: { text: 'text' },
effectiveDateTime: new Date().toISOString(),
valueQuantity: { value: 7, unit: 'unit' },
valueQuantity: { value: 7, unit: 'unit', code: 'code' },
};
expect((mapper.map(observation, 'custom').scale as any).title.text[0]).toBe('custom');
});
Expand Down
6 changes: 4 additions & 2 deletions .../ngx-charts-on-fhir/src/lib/fhir-mappers/observation/simple-observation-mapper.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export type SimpleObservation = {
valueQuantity: {
value: number;
unit: string;
code: string;
};
} & Observation;
export function isSimpleObservation(resource: Observation): resource is SimpleObservation {
Expand All @@ -29,7 +30,8 @@ export function isSimpleObservation(resource: Observation): resource is SimpleOb
resource.code?.text &&
resource.effectiveDateTime &&
resource.valueQuantity?.value &&
resource.valueQuantity?.unit
resource.valueQuantity?.unit &&
resource.valueQuantity?.code
);
}

Expand Down Expand Up @@ -71,7 +73,7 @@ export class SimpleObservationMapper implements Mapper<SimpleObservation> {
],
scale: merge({}, this.linearScaleOptions, {
id: layerName,
title: { text: [layerName, resource.valueQuantity.unit] },
title: { text: [layerName, resource.valueQuantity.code] },
}),
annotations: resource.referenceRange
?.map((range) => this.referenceRangeService.createReferenceRangeAnnotation(range, layerName, layerName))
Expand Down
Loading