Merge pull request #25 from HL7-DaVinci/master

Fork Auto Sync

Author: smalho01

package-lock.json

@@ -49,7 +49,7 @@
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.21",
     "lowdb": "^1.0.0",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.7",
     "pdfmake": "^0.1.56",
     "pem": "^1.14.4",
     "react": "^16.8.4",

package.json

@@ -103,6 +103,12 @@ export default class App extends Component {
   }
 
   ehrLaunch(isContainedQuestionnaire, questionnaire) {
+    // Temporary indication before full supports for relaunch is implemented
+    if(!this.appContext.request) {
+      alert("Supports for relaunch will be added in the near future!");
+      this.consoleLog("Supports for relaunch will be added in the near future!", "errorClass");
+      return;
+    }
     const deviceRequest = JSON.parse(this.appContext.request.replace(/\\/g,""));
     this.consoleLog("fetching artifacts", "infoClass");
     this.setState({

src/App.jsx

@@ -914,9 +914,33 @@ export default class QuestionnaireForm extends Component {
     };
     this.addAuthorToResponse(qr, this.getPractitioner());
 
-    qr.questionnaire = this.props.qform.id;
+    qr.questionnaire = `${this.FHIR_PREFIX}${this.fhirVersion}/Questionnaire/${this.props.qform.id}`;
     console.log("GetQuestionnaireResponse final QuestionnaireResponse: ", qr);
 
+    const request = this.props.deviceRequest;
+    // add context extension
+    qr.extension = [];
+    if(request !== undefined) {
+      const contextExtensionUrl = "http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/context";
+      qr.extension.push({
+        url: contextExtensionUrl,
+        valueReference: {
+          reference: `${request.resourceType}/${request.id}`,
+          type: `${request.resourceType}`
+        }
+      })
+
+      if(request.insurance !== null && request.insurance.length > 0) {
+        const coverage = request.insurance[0];
+        qr.extension.push({
+          url: contextExtensionUrl,
+          valueReference: {
+            reference: `${coverage.reference}`,
+            type: "Coverage"
+          }
+        })
+      }
+   }
     console.log(this.props.attested);
     const aa = searchQuestionnaire(qr, this.props.attested);
     console.log(aa);
@@ -1413,14 +1437,16 @@ export default class QuestionnaireForm extends Component {
       if (newItem.item == undefined) {
         //find the corresponding linkId in savedItem and replace it
         const findSavedParentItem = (parentLinkId, savedItem) => {
-          if (savedItem.linkId == parentLinkId) {
+          if (savedItem.linkId === parentLinkId) {
             return savedItem;
           } else {
-            const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId);
-            if (parentIndex != -1) {
-              return savedItem.item[parentIndex];
-            } else {
-              findSavedParentItem(parentLinkId, savedItem.item);
+            if (savedItem.item) {
+              const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId);
+              if (parentIndex != -1) {
+                return savedItem.item[parentIndex];
+              } else {
+                findSavedParentItem(parentLinkId, savedItem.item);
+              }
             }
           }
         };