From 1aa8a2d0a796e5966c18ceace313eb2904762961 Mon Sep 17 00:00:00 2001
From: kghoreshi <kghoreshi@mitre.org>
Date: Wed, 16 Feb 2022 13:57:56 -0500
Subject: [PATCH 1/3] prelim changes

---
 .../QuestionnaireForm/QuestionnaireForm.jsx   | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/components/QuestionnaireForm/QuestionnaireForm.jsx b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
index 0d1c96c0..9d51a2f3 100644
--- a/src/components/QuestionnaireForm/QuestionnaireForm.jsx
+++ b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
@@ -1009,18 +1009,8 @@ export default class QuestionnaireForm extends Component {
       return;
     }
 
+    console.log(qr);
     // For HIMSS Demo with Mettle always use GCS as payor info
-    const insurer = {
-      resourceType: "Organization",
-      id: "org1234",
-      name: "GCS",
-      identifier: [
-        {
-          system: "urn:ietf:rfc:3986",
-          value: "2.16.840.1.113883.13.34.110.1.150.2"
-        }
-      ]
-    };
     const managingOrg = {
       resourceType: "Organization",
       id: "org1111",
@@ -1064,7 +1054,6 @@ export default class QuestionnaireForm extends Component {
     if (priorAuthBundle && this.isPriorAuthBundleValid(priorAuthBundle)) {
       priorAuthBundle.entry.unshift({ resource: managingOrg });
       priorAuthBundle.entry.unshift({ resource: facility });
-      priorAuthBundle.entry.unshift({ resource: insurer });
       priorAuthBundle.entry.unshift({ resource: this.props.deviceRequest });
       priorAuthBundle.entry.unshift({ resource: qr });
 
@@ -1096,9 +1085,6 @@ export default class QuestionnaireForm extends Component {
           // TODO: make this organization
           reference: this.makeReference(priorAuthBundle, "Practitioner")
         },
-        insurer: {
-          reference: this.makeReference(priorAuthBundle, "Organization")
-        },
         facility: {
           reference: this.makeReference(priorAuthBundle, "Location")
         },
@@ -1177,6 +1163,19 @@ export default class QuestionnaireForm extends Component {
           }
         ]
       };
+
+      const signature = {
+        resourceType: "Signature",
+        type: [
+          {
+            system: "urn:iso-astm:E1762-95:2013",
+            code: "1.2.840.10065.1.12.1.14",
+            display: "Source Signature"
+          }
+        ],
+        when:  new Date(Date.now()).toISOString(),
+        who:  this.makeReference(priorAuthBundle, "Practitioner")
+      }
       var sequence = 1;
       priorAuthBundle.entry.forEach(function (entry, index) {
         if (entry.resource.resourceType == "Condition") {
@@ -1186,8 +1185,21 @@ export default class QuestionnaireForm extends Component {
           });
         }
       });
+      priorAuthBundle.timestamp = new Date(Date.now()).toISOString()
+      priorAuthBundle.language = "en";
+      priorAuthBundle.id = shortid.generate();
+      priorAuthBundle.meta = {
+        lastUpdated: Date.now()
+      }
+      priorAuthBundle.implicitRules = "http://build.fhir.org/ig/HL7/davinci-pas/StructureDefinition-profile-pas-request-bundle"
+      priorAuthBundle.identifier = {
+        use: "official",
+        system: "urn:uuid:mitre-drls",
+        value: shortid.generate()
+      }
+      priorAuthBundle.signature = signature;
       console.log(priorAuthClaim);
-
+      console.log(priorAuthBundle);
       priorAuthBundle.entry.unshift({ resource: priorAuthClaim });
 
       this.props.setPriorAuthClaim(priorAuthBundle);

From 9ba58ad06b5b9bd0468a2c38443a86e0017f28c1 Mon Sep 17 00:00:00 2001
From: kghoreshi <kghoreshi@mitre.org>
Date: Fri, 18 Feb 2022 14:58:27 -0500
Subject: [PATCH 2/3] minor cleanup

---
 src/components/QuestionnaireForm/QuestionnaireForm.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/QuestionnaireForm/QuestionnaireForm.jsx b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
index 9d51a2f3..c7e1f12e 100644
--- a/src/components/QuestionnaireForm/QuestionnaireForm.jsx
+++ b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
@@ -1198,8 +1198,6 @@ export default class QuestionnaireForm extends Component {
         value: shortid.generate()
       }
       priorAuthBundle.signature = signature;
-      console.log(priorAuthClaim);
-      console.log(priorAuthBundle);
       priorAuthBundle.entry.unshift({ resource: priorAuthClaim });
 
       this.props.setPriorAuthClaim(priorAuthBundle);

From 548ee05dc05d77d305ad971608dd086322e2b031 Mon Sep 17 00:00:00 2001
From: kghoreshi <kghoreshi@mitre.org>
Date: Mon, 28 Feb 2022 00:51:55 -0500
Subject: [PATCH 3/3] cleanup

---
 src/components/QuestionnaireForm/QuestionnaireForm.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/QuestionnaireForm/QuestionnaireForm.jsx b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
index c7e1f12e..e59f7405 100644
--- a/src/components/QuestionnaireForm/QuestionnaireForm.jsx
+++ b/src/components/QuestionnaireForm/QuestionnaireForm.jsx
@@ -1009,7 +1009,6 @@ export default class QuestionnaireForm extends Component {
       return;
     }
 
-    console.log(qr);
     // For HIMSS Demo with Mettle always use GCS as payor info
     const managingOrg = {
       resourceType: "Organization",