Merge pull request LHNCBC#1 from khristinalukanets/master

Merge changes from Khrystyna
khristinalukanets · May 17, 2021 · 4b46544 · 4b46544
2 parents 8df8610 + 66b454b
commit 4b46544
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/app/components/fhir-data/fhir.service.js b/app/components/fhir-data/fhir.service.js
@@ -570,16 +570,16 @@ fb.service('fhirService', [
 
     /**
      * Create Questionnaire if it does not exist, and QuestionnaireResponse and
-     * its extracted observations.
+     * its extracted observations and conditions.
      * Data returned through an angular broadcast event.
      * @param q the Questionnaire resource
      * @param qr the QuestionnaireResponse resource
-     * @param con the QuestionnaireResponse resource
      * @param obsArray the array of Observations extracted from qr
      * @param qExists true if the questionnaire is known to exist (in which case
+     * @param resources the bundle with all resources
      * we skip the lookup)
      */
-    thisService.createQQRObsConds = function(q, qr, con, obsArray, qExists) {
+    thisService.createQQRObsCond = function(q, qr, obsArray, qExists, resources) {
       _terminatingError = null;
 
       // Build a FHIR transaction bundle to create these resources.
@@ -589,28 +589,26 @@ fb.service('fhirService', [
         entry: []
       };
 
-      bundle.entry.push({
-        resource: qr,
-        request: {
-          method: "POST",
-          url: "QuestionnaireResponse"
-        }
+      resources.entry.forEach(function (item) {
+        bundle.entry.push({
+          resource: item.resource,
+          request: {
+            method: "POST",
+            url: item.resource.resourceType
+          }
+        });
       });
 
-      bundle.entry.push({
-        resource: con,
-        request: {
-          method: "POST",
-          url: "Condition"
-        }
+      var hasQuestionnaireResponse = bundle.entry.some(function (item) {
+        return item.resource.resourceType === "QuestionnaireResponse";
       });
 
-      for (var i=0, len=obsArray.length; i<len; ++i) {
+      if (!hasQuestionnaireResponse) {
         bundle.entry.push({
-          resource: obsArray[i],
+          resource: qr,
           request: {
             method: "POST",
-            url: "Observation"
+            url: "QuestionnaireResponse"
           }
         });
       }
@@ -621,7 +619,6 @@ fb.service('fhirService', [
           body: JSON.stringify(bundle)}).then(
 
             function success(resp) {
-              debugger;
               _collectedResults.push(resp);
               reportResults();
               // Look through the bundle for the QuestionnaireResource ID

diff --git a/app/fhir-app/fhir-app-content.controller.js b/app/fhir-app/fhir-app-content.controller.js
@@ -131,10 +131,10 @@ angular.module('lformsApp')
           jQuery.ajax('http://localhost:8080/administration/convert', {
             method: 'POST',
             crossDomain: true,
-            dataType: "json",
+            contentType: 'application/json',
             data: JSON.stringify(qr)
           }).done(function (data) {
-            // fhirService.createQQRObsConds(qData, qr, data.con, resArray, qExists);
+            fhirService.createQQRObsCond(qData, qr, resArray, qExists, data);
           });
         };