value[x] based approach

Author: julianxcarter

src/extractors/CSVCancerDiseaseStatusExtractor.js

@@ -16,15 +16,14 @@ class CSVCancerDiseaseStatusExtractor {
     logger.debug('Reformatting disease status data from CSV into template format');
     // Check the shape of the data
     arrOfDiseaseStatusData.forEach((record) => {
-      if (!record.mrn || !record.conditionId || (!record.diseaseStatusCode && record.observationStatus !== 'not evaluated') || !record.dateOfObservation) {
+      if (!record.mrn || !record.conditionId || !record.diseaseStatusCode || !record.dateOfObservation) {
         throw new Error('DiseaseStatusData missing an expected property: mrn, conditionId, diseaseStatusCode, and dateOfObservation are required.');
       }
     });
     const evidenceDelimiter = '|';
     return arrOfDiseaseStatusData.map((record) => ({
       status: record.observationStatus || 'final',
-      // If the Disease Status was not evaluated, there will be no value to make a record of and this property will be null
-      value: record.observationStatus === 'not evaluated' ? null : {
+      value: {
         code: record.diseaseStatusCode,
         system: 'http://snomed.info/sct',
         display: record.diseaseStatusText ? record.diseaseStatusText : getDiseaseStatusDisplay(record.diseaseStatusCode, this.implementation),

src/templates/CancerDiseaseStatusTemplate.js

@@ -29,9 +29,9 @@ function subjectTemplate({ subject }) {
   };
 }
 
-function valueTemplate(valueObj) {
-  if (valueObj === null) return { valueCodeableConcept: extensionArr(dataAbsentReasonExtension('not-asked')) };
-  return valueX(valueObj, 'valueCodeableConcept');
+function valueTemplate({ code, display, system }) {
+  if (code === '709137006') return { valueCodeableConcept: extensionArr(dataAbsentReasonExtension('not-asked')) };
+  return valueX({ code, display, system }, 'valueCodeableConcept');
 }
 
 function cancerDiseaseStatusTemplate({
@@ -43,7 +43,7 @@ function cancerDiseaseStatusTemplate({
   value,
   evidence,
 }) {
-  if (!id || !status || !effectiveDateTime || !condition || !subject || (!value && status !== 'not evaluated')) {
+  if (!id || !status || !effectiveDateTime || !condition || !subject || !value) {
     throw Error('Trying to render a CancerDiseaseStatusTemplate, but a required argument is missing; ensure that id, status, effectiveDateTime, condition, subject, and value are all present');
   }
 
@@ -56,7 +56,7 @@ function cancerDiseaseStatusTemplate({
       ],
     },
     ...extensionArr(...evidenceTemplate({ evidence })),
-    status: status === 'not evaluated' ? 'final' : status,
+    status,
     category: [
       {
         coding: [

test/extractors/CSVCancerDiseaseStatusExtractor.test.js

@@ -36,13 +36,6 @@ describe('CSVCancerDiseaseStatusExtractor', () => {
       // Only including required properties is valid
       expect(csvCancerDiseaseStatusExtractor.joinAndReformatData(localData)).toEqual(expect.anything());
 
-      // Excluding diseaseStatusCode with an obseervationStatus of 'not evaluated' should be valid
-      localData[0].observationStatus = 'not evaluated';
-      localData[0].diseaseStatusCode = '';
-      expect(csvCancerDiseaseStatusExtractor.joinAndReformatData(localData)).toEqual(expect.anything());
-
-      localData[0].observationStatus = '';
-
       const requiredProperties = ['mrn', 'conditionId', 'diseaseStatusCode', 'dateOfObservation'];
 
       // Removing each required property should throw an error

test/templates/cancerDiseaseStatus.test.js

@@ -44,8 +44,12 @@ describe('test CancerDiseaseStatus template', () => {
     const MINIMAL_DATA = {
       // Minimal amount of data to be accepted, evidence is excluded
       id: 'CancerDiseaseStatus-fixture',
-      status: 'not evaluated',
-      value: null,
+      status: 'final',
+      value: {
+        code: '709137006',
+        system: 'http://snomed.info/sct',
+        display: 'not evaluated',
+      },
       subject: {
         id: '123-example-patient',
         name: 'Mr. Patient Example',