Merge pull request #76 from mcode/reference-resourcetype

resourceType parameter added to reference snippet

Author: julianxcarter

src/templates/CancerDiseaseStatusTemplate.js

@@ -12,14 +12,14 @@ function evidenceTemplate({ evidence }) {
 function focusTemplate({ condition }) {
   return {
     focus: [
-      reference(condition),
+      reference({ ...condition, resourceType: 'Condition' }),
     ],
   };
 }
 
 function subjectTemplate({ subject }) {
   return {
-    subject: reference(subject),
+    subject: reference({ ...subject, resourceType: 'Patient' }),
   };
 }
 

src/templates/CancerRelatedMedicationTemplate.js

@@ -25,7 +25,7 @@ function medicationTemplate({ code, codeSystem, displayText }) {
 
 function subjectTemplate({ id }) {
   return {
-    subject: reference({ id }),
+    subject: reference({ id, resourceType: 'Patient' }),
   };
 }
 

src/templates/CarePlanWithReviewTemplate.js

@@ -60,7 +60,7 @@ function carePlanChangeReasonExtensionTemplate({ hasChanged, reasonCode, reasonD
 
 function subjectTemplate(subject) {
   return {
-    subject: reference(subject),
+    subject: reference({ ...subject, resourceType: 'Patient' }),
   };
 }
 

src/templates/ConditionTemplate.js

@@ -86,7 +86,7 @@ function bodySiteTemplate({ bodySite, laterality }) {
 
 function subjectTemplate({ subject }) {
   return {
-    subject: reference(subject),
+    subject: reference({ ...subject, resourceType: 'Patient' }),
   };
 }
 

src/templates/ObservationTemplate.js

@@ -47,7 +47,7 @@ function codeTemplate({ code, system, display }) {
 
 function subjectTemplate({ subjectId }) {
   return {
-    subject: reference({ id: subjectId }),
+    subject: reference({ id: subjectId, resourceType: 'Patient' }),
   };
 }
 

src/templates/ProcedureTemplate.js

@@ -26,7 +26,7 @@ function reasonTemplate({ reasonCode, reasonCodeSystem, reasonDisplayName }) {
 function reasonReference(conditionId) {
   return {
     reasonReference: [
-      reference({ id: conditionId }),
+      reference({ id: conditionId, resourceType: 'Condition' }),
     ],
   };
 }
@@ -68,7 +68,7 @@ function procedureTemplate({
         coding({ code, system, display }),
       ],
     },
-    subject: reference({ id: subjectId }),
+    subject: reference({ id: subjectId, resourceType: 'Patient' }),
     performedDateTime: effectiveDateTime,
     ...ifSomeArgsObj(reasonTemplate)({ reasonCode, reasonCodeSystem, reasonDisplayName }),
     ...(conditionId && reasonReference(conditionId)),

src/templates/ResearchSubjectTemplate.js

@@ -14,7 +14,7 @@ function studyTemplate(trialResearchID) {
 function individualTemplate(patientId) {
   return {
     individual: {
-      ...reference({ id: patientId }),
+      ...reference({ id: patientId, resourceType: 'Patient' }),
     },
   };
 }

src/templates/StagingTemplate.js

@@ -25,7 +25,7 @@ function hasMemberTemplate(categoryIds) {
   if (!categoryIds || categoryIds.length === 0) return {};
 
   return {
-    hasMember: categoryIds.map((id) => reference({ id })),
+    hasMember: categoryIds.map((id) => reference({ id, resourceType: 'Observation' })),
   };
 }
 
@@ -75,10 +75,10 @@ function stagingTemplate({
       ],
     },
     ...stagingMethodTemplate({ code: stagingSystem, system: stagingCodeSystem }),
-    subject: reference({ id: subjectId }),
+    subject: reference({ id: subjectId, resourceType: 'Patient' }),
     effectiveDateTime,
     ...valueX({ code: stageGroup, system: 'http://cancerstaging.org' }, 'valueCodeableConcept'),
-    focus: [reference({ id: conditionId })],
+    focus: [reference({ id: conditionId, resourceType: 'Condition' })],
     ...hasMemberTemplate(categoryIds),
   };
 }

src/templates/TNMCategoryTemplate.js

@@ -98,11 +98,11 @@ function tnmCategoryTemplate({
         }),
       ],
     },
-    subject: reference({ id: subjectId }),
+    subject: reference({ id: subjectId, resourceType: 'Patient' }),
     ...stagingMethodTemplate({ code: stagingSystem, system: stagingCodeSystem }),
     effectiveDateTime,
     ...valueX({ code: valueCode, system: 'http://cancerstaging.org' }, 'valueCodeableConcept'),
-    focus: [reference({ id: conditionId })],
+    focus: [reference({ id: conditionId, resourceType: 'Condition' })],
   };
 }
 

src/templates/snippets/reference.js

@@ -1,9 +1,10 @@
-function reference({ id, name }) {
+function reference({ id, name, resourceType }) {
   if (!id) throw Error('Trying to render a reference snippet, but the id argument is missing.');
 
   return {
     reference: `urn:uuid:${id}`,
     ...(name && { display: name }),
+    ...(resourceType && { type: resourceType }),
   };
 }