From 5c31fd2723f6919817c8e1d1e533afb029ab0c3f Mon Sep 17 00:00:00 2001 From: Anna Grishkan Date: Fri, 6 Aug 2021 15:39:14 -0400 Subject: [PATCH 1/3] Adding required field intent to MedicationRequest --- src/reducers/medication-reducers.js | 3 +++ tests/reducers/medication-reducers.test.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/reducers/medication-reducers.js b/src/reducers/medication-reducers.js index 2237146..b64ca39 100644 --- a/src/reducers/medication-reducers.js +++ b/src/reducers/medication-reducers.js @@ -31,6 +31,9 @@ export const createFhirResource = (fhirVersion, patientId, state, patientConditi id: isSTU3OrHigher ? 'request-123' : 'order-123', status: 'draft', }; + if (isSTU3OrHigher) { + resource.intent = 'order'; //proposal | plan | order | instance-order + } resource[`${isSTU3OrHigher ? 'subject' : 'patient'}`] = { reference: `Patient/${patientId}`, diff --git a/tests/reducers/medication-reducers.test.js b/tests/reducers/medication-reducers.test.js index c0db972..d249b9d 100644 --- a/tests/reducers/medication-reducers.test.js +++ b/tests/reducers/medication-reducers.test.js @@ -396,6 +396,7 @@ describe('Medication Reducers', () => { id: 'request-123', authoredOn: moment().format('YYYY-MM-DD'), status: 'draft', + intent: 'order', subject: { reference: `Patient/${patientId}`, }, From e74ea5452f264458ef1e08cda31d78e881c073eb Mon Sep 17 00:00:00 2001 From: Anna Grishkan Date: Fri, 6 Aug 2021 16:38:43 -0400 Subject: [PATCH 2/3] Changing default value for MedicationRequest.intent to proposal instead of order --- src/reducers/medication-reducers.js | 2 +- tests/reducers/medication-reducers.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/reducers/medication-reducers.js b/src/reducers/medication-reducers.js index b64ca39..34c1571 100644 --- a/src/reducers/medication-reducers.js +++ b/src/reducers/medication-reducers.js @@ -32,7 +32,7 @@ export const createFhirResource = (fhirVersion, patientId, state, patientConditi status: 'draft', }; if (isSTU3OrHigher) { - resource.intent = 'order'; //proposal | plan | order | instance-order + resource.intent = 'proposal'; //proposal | plan | order | instance-order } resource[`${isSTU3OrHigher ? 'subject' : 'patient'}`] = { diff --git a/tests/reducers/medication-reducers.test.js b/tests/reducers/medication-reducers.test.js index d249b9d..3303358 100644 --- a/tests/reducers/medication-reducers.test.js +++ b/tests/reducers/medication-reducers.test.js @@ -396,7 +396,7 @@ describe('Medication Reducers', () => { id: 'request-123', authoredOn: moment().format('YYYY-MM-DD'), status: 'draft', - intent: 'order', + intent: 'proposal', subject: { reference: `Patient/${patientId}`, }, From f7956368283daafe402233df4b26b62bf761b3de Mon Sep 17 00:00:00 2001 From: Anna Grishkan Date: Mon, 9 Aug 2021 11:44:28 -0400 Subject: [PATCH 3/3] Fixing missed unit-test for Med Request R4 --- tests/reducers/medication-reducers.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/reducers/medication-reducers.test.js b/tests/reducers/medication-reducers.test.js index 3303358..4f04e39 100644 --- a/tests/reducers/medication-reducers.test.js +++ b/tests/reducers/medication-reducers.test.js @@ -440,6 +440,7 @@ describe('Medication Reducers', () => { id: 'request-123', authoredOn: moment().format('YYYY-MM-DD'), status: 'draft', + intent: 'proposal', subject: { reference: `Patient/${patientId}`, },