From 2d425be7607fe92522bef27936fd6eaa5329d85c Mon Sep 17 00:00:00 2001 From: Amy Chen Date: Mon, 30 Dec 2024 15:56:26 -0800 Subject: [PATCH] fix exception --- src/components/Landing/index.jsx | 2 +- src/utils/executeELM.js | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/Landing/index.jsx b/src/components/Landing/index.jsx index f7af6235e..448673e72 100644 --- a/src/components/Landing/index.jsx +++ b/src/components/Landing/index.jsx @@ -177,7 +177,7 @@ export default class Landing extends Component { () => { this.initEvents(); this.clearProcessInterval(); - this.savePDMPSummaryData(); + //this.savePDMPSummaryData(); this.handleSetActiveTab(0); } ); diff --git a/src/utils/executeELM.js b/src/utils/executeELM.js index a13284ef4..e47ba7401 100644 --- a/src/utils/executeELM.js +++ b/src/utils/executeELM.js @@ -95,13 +95,14 @@ async function executeELM(collector, paramResourceTypes) { const shouldLoadSurveyResources = FHIR_RELEASE_VERSION_4 && INSTRUMENT_LIST; const surveyResources = shouldLoadSurveyResources - ? SURVEY_FHIR_RESOURCES + ? [...SURVEY_FHIR_RESOURCES, "Report"] : []; const requests = [ ...extractResourcesFromELM(library), ...surveyResources, ].map((name) => { resourceTypes[name] = false; + if (name === "Report") return true; if (name === "Patient") { resourceTypes[name] = true; return [pt]; @@ -218,6 +219,7 @@ async function executeELM(collector, paramResourceTypes) { patientBundle ).then(results => { Promise.allSettled(results).then((results) => { + resourceTypes["Report"] = true; if (!results) { resolve(evalResults); return; @@ -243,9 +245,13 @@ async function executeELM(collector, paramResourceTypes) { "final evaluated CQL results including surveys ", evaluatedSurveyResults ); + resourceTypes["Report"] = true; resolve(evalResults); }); }).catch((e) => { + resourceTypes["Report"] = { + error: e + } console.log("Error processing instrument ELM: ", e); reject("error processing instrument ELM. See console for details."); });