Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 2 additions & 15 deletions src/templates/ConditionTemplate.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const { extensionArr, coding, valueX, reference } = require('./snippets');
const { ifAllArgsObj } = require('../helpers/templateUtils');
const { isConditionCodeCancer } = require('../helpers/conditionUtils');

function histologyTemplate({ histology }) {
return {
Expand Down Expand Up @@ -41,20 +40,8 @@ function individualCategoryTemplate(category) {
};
}

function categoryArrayTemplate(array, code) {
function categoryArrayTemplate(array) {
const category = array.map(individualCategoryTemplate);
const codeValue = `${code.code}`;
const codeSystem = `${code.system}`;
if (isConditionCodeCancer(codeValue, codeSystem)) {
// On cancer conditions, include the fixed value for the disease category
category.push({
coding: [coding({
system: 'http://snomed.info/sct',
code: '64572001',
}),
],
});
}
return { category };
}

Expand Down Expand Up @@ -126,7 +113,7 @@ function conditionTemplate({
),
...ifAllArgsObj(clinicalStatusTemplate)({ clinicalStatus }),
...ifAllArgsObj(verificationStatusTemplate)({ verificationStatus }),
...categoryArrayTemplate(category, code),
...categoryArrayTemplate(category),
...codingTemplate({ code }),
...ifAllArgsObj(bodySiteTemplate)({ bodySite, laterality }),
...subjectTemplate({ subject }),
Expand Down
8 changes: 0 additions & 8 deletions test/extractors/fixtures/csv-condition-bundle.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@
"code": "example-category"
}
]
},
{
"coding": [
{
"system": "http://snomed.info/sct",
"code": "64572001"
}
]
}
],
"code": {
Expand Down
23 changes: 0 additions & 23 deletions test/templates/condition.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const { isValidFHIR } = require('../../src/helpers/fhirUtils');
const maximalValidExampleCondition = require('./fixtures/maximal-condition-resource.json');
const minimalValidExampleCondition = require('./fixtures/minimal-condition-resource.json');
const cancerValidExampleCondition = require('./fixtures/cancer-condition-resource.json');
const { conditionTemplate } = require('../../src/templates/ConditionTemplate');
const { allOptionalKeyCombinationsNotThrow } = require('../utils');

Expand Down Expand Up @@ -114,26 +113,4 @@ describe('test Condition template', () => {
test('invalid data should throw an error', () => {
expect(() => conditionTemplate(CONDITION_INVALID_DATA)).toThrow(Error);
});

test('cancer conditions should include the "disease" category', () => {
const diseaseCategory = {
coding: [
{
code: '64572001',
system: 'http://snomed.info/sct',
},
],
};
// Use a cancer condition code when generating resource
const cancerConditionData = { ...CONDITION_MINIMAL_DATA, code: { code: 'C02.0', system: 'http://hl7.org/fhir/sid/icd-10-cm' } };
const generatedCondition = conditionTemplate(cancerConditionData);
expect(generatedCondition.category).toContainEqual(diseaseCategory);
expect(generatedCondition).toEqual(cancerValidExampleCondition);
});

test('non-cancer conditions should not include the "disease" category', () => {
const generatedCondition = conditionTemplate(CONDITION_MINIMAL_DATA);
expect(generatedCondition.category).toHaveLength(1); // Only provided category is present
expect(generatedCondition).toEqual(minimalValidExampleCondition);
});
});
34 changes: 0 additions & 34 deletions test/templates/fixtures/cancer-condition-resource.json

This file was deleted.