davinci_crd_test_kit 0.14.0 → 0.14.2

data/lib/davinci_crd_test_kit/client/v2.2.1/attestations/client_security_and_privacy_attestation_test.rb

@@ -0,0 +1,43 @@
+require_relative 'attestation_instructions'
+
+module DaVinciCRDTestKit
+  module V221
+    class SecurityAndPrivacyAttestationTest < Inferno::Test
+      id :crd_v221_security_and_privacy_attestation
+      ATTESTATION_TITLE = 'Health IT module adheres to security and privacy requirements'.freeze
+      title ATTESTATION_TITLE
+      description %(
+        During this test, the tester will confirm that the Health IT module adheres to the security and privacy
+        rules that CRD inherits from the specifications it builds on.
+        To see the specifics of the attested requirements, click the "View Specification Requirements" link for this
+        test.
+      )
+      attestation
+      verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@sec-1'
+      input_instructions ATTESTATION_INPUT_INSTRUCTIONS
+
+      input :security_and_privacy_attestation,
+            title: ATTESTATION_TITLE,
+            description: %(
+              I attest that the Health IT module adheres to the security and privacy rules that CRD inherits from
+              the specifications it builds on.
+            ),
+            type: 'radio',
+            default: 'false',
+            options: {
+              list_options: [
+                { label: 'Yes', value: 'true' },
+                { label: 'No', value: 'false' }
+              ]
+            }
+      input :security_and_privacy_attestation_note,
+            title: 'Notes, if applicable:',
+            type: 'textarea',
+            optional: true
+
+      run do
+        assert security_and_privacy_attestation == 'true'
+      end
+    end
+  end
+end

data/lib/davinci_crd_test_kit/client/v2.2.1/attestations/client_workflow_integration_attestation_test.rb

@@ -0,0 +1,44 @@
+require_relative 'attestation_instructions'
+
+module DaVinciCRDTestKit
+  module V221
+    class WorkflowIntegrationAttestationTest < Inferno::Test
+      id :crd_v221_workflow_integration_attestation
+      ATTESTATION_TITLE = 'Health IT module integrates hook invocations transparently into user workflows'.freeze
+      title ATTESTATION_TITLE
+      description %(
+        During this test, the tester will confirm that the Health IT module integrates CRD hook invocations
+        transparently into the regular user workflow.
+        To see the specifics of the attested requirements, click the "View Specification Requirements" link for this
+        test.
+      )
+      attestation
+      verifies_requirements 'hl7.fhir.us.davinci-crd_2.2.1@hook-7', 'hl7.fhir.us.davinci-crd_2.2.1@hook-8',
+                            'hl7.fhir.us.davinci-crd_2.2.1@resp-48'
+      input_instructions ATTESTATION_INPUT_INSTRUCTIONS
+
+      input :workflow_integration_attestation,
+            title: ATTESTATION_TITLE,
+            description: %(
+              I attest that the Health IT module integrates CRD hook invocations transparently into the regular
+              user workflow.
+            ),
+            type: 'radio',
+            default: 'false',
+            options: {
+              list_options: [
+                { label: 'Yes', value: 'true' },
+                { label: 'No', value: 'false' }
+              ]
+            }
+      input :workflow_integration_attestation_note,
+            title: 'Notes, if applicable:',
+            type: 'textarea',
+            optional: true
+
+      run do
+        assert workflow_integration_attestation == 'true'
+      end
+    end
+  end
+end

data/lib/davinci_crd_test_kit/client/v2.2.1/auth/decode_auth_token_test.rb

@@ -21,7 +21,7 @@ module DaVinciCRDTestKit
       output :auth_tokens, :auth_token_payloads_json, :auth_token_headers_json
 
       run do
-        load_hook_requests
+        load_interaction_group_requests
         skip_if requests.empty?, "No #{hook_name} requests were made in a previous test as expected."
         auth_tokens = []
         auth_token_payloads_json = []

data/lib/davinci_crd_test_kit/client/v2.2.1/auth/retrieve_jwks_test.rb

@@ -11,7 +11,8 @@ module DaVinciCRDTestKit
         During this test, Inferno will verify that for each request the JWKS can be retrieved from the JWKS uri if
         it is present in the `jku` field within the JWT token header. Additionally, keys will be extracted and
         outputted for use in subsequent tests. If the client does not provide a uri in the `jku` field,
-        Inferno will extract keys from the raw JWKS JSON provided out of band as a part of the "Registration" group.
+        Inferno will use the JWK Set provided out of band as a part of the "Registration" group, either
+        retrieving it from a url or, if provided directly, extracting keys from the raw JWKS JSON.
       )
 
       verifies_requirements 'cds-hooks_3.0.0-ballot@183', 'cds-hooks_3.0.0-ballot@185', 'cds-hooks_3.0.0-ballot@197',
@@ -22,12 +23,10 @@ module DaVinciCRDTestKit
             title: 'CRD JSON Web Key Set (JWKS)',
             type: 'textarea',
             description: %(
-            The client's registered JWK Set containing it's public key. Used
-            only when a request was received with a JWT without the `jku` header.
-            Inferno assumes this input, provided during the "Registration"
-            group, contains the raw JSON representation of a JWKS (if a URI was provided
-            it would be populated in the `jku` header). Run or re-run the "Registration"
-            group to set or change this value.
+            The client's registered JWK Set, provided during the "Registration" group, containing
+            it's public key. Used only when a request was received with a JWT without the `jku`
+            header. May be either a publicly accessible url containing the JWKS, or the raw JWKS
+            JSON. Run or re-run the "Registration" group to set or change this value.
           ),
             locked: true,
             optional: true
@@ -49,18 +48,9 @@ module DaVinciCRDTestKit
           jku = JSON.parse(token_header)['jku'] # NOTE: pre-verified json
           jwks =
             if jku.present?
-              get(jku)
-
-              if response[:status] == 200
-                parse_json_request_entity(response[:body], 'Fetched jku url response', index)
-              else
-                add_request_message('error',
-                                    "Unexpected response status: expected 200, but received #{response[:status]}",
-                                    index)
-                nil
-              end
+              fetch_jwks(jku, 'Fetched jku url response', index)
             else
-              parse_json_request_entity(cds_jwk_set, 'JWK Set input', index)
+              parse_or_fetch_jwks(cds_jwk_set, index)
             end
           if jwks.blank?
             crd_jwks_keys_json << nil
@@ -115,6 +105,27 @@ module DaVinciCRDTestKit
           token_header.present? && JSON.parse(token_header)['jku'].blank?
         end
       end
+
+      def fetch_jwks(uri, entity, index)
+        get(uri)
+
+        if response[:status] == 200
+          parse_json_request_entity(response[:body], entity, index)
+        else
+          add_request_message('error',
+                              "Unexpected response status: expected 200, but received #{response[:status]}",
+                              index)
+          nil
+        end
+      end
+
+      def parse_or_fetch_jwks(jwk_set_input, index)
+        if jwk_set_input.match?(%r{\Ahttps?://})
+          fetch_jwks(jwk_set_input, 'Fetched JWK Set input url response', index)
+        else
+          parse_json_request_entity(jwk_set_input, 'JWK Set input', index)
+        end
+      end
     end
   end
 end

data/lib/davinci_crd_test_kit/client/v2.2.1/auth/token_payload_test.rb

@@ -45,7 +45,7 @@ module DaVinciCRDTestKit
       run do
         auth_tokens_list = JSON.parse(auth_tokens)
         auth_tokens_jwk = JSON.parse(auth_tokens_jwk_json)
-        requests = load_hook_requests
+        requests = load_interaction_group_requests
         skip_if auth_tokens_list.compact.empty?, 'No Authorization tokens produced from the previous tests.'
         skip_if auth_tokens_jwk.compact.empty?, 'No Authorization token JWK produced from the previous test.'
 
@@ -56,34 +56,47 @@ module DaVinciCRDTestKit
 
           begin
             jwk = JSON.parse(auth_token_jwk).deep_symbolize_keys # NOTE: pre-verified json
-
-            payload, =
-              JWT.decode(
-                auth_tokens_list[index],
-                JWT::JWK.import(jwk).public_key,
-                true,
-                algorithms: [jwk[:alg]],
-                exp_leeway: 60,
-                iss: cds_jwt_iss,
-                aud: public_hook_url(request),
-                verify_not_before: false,
-                verify_iat: false,
-                verify_jti: true,
-                verify_iss: true,
-                verify_aud: true
-              )
+            unverified_payload, jwt_header = JWT.decode(auth_tokens_list[index], nil, false)
           rescue StandardError => e
             add_request_message('error', "Token validation error: #{e.message}", index)
             next
           end
 
-          missing_claims = required_claims - payload.keys
-          missing_claims_string = missing_claims.map { |claim| "`#{claim}`" }.join(', ')
+          alg = jwk[:alg] || jwt_header['alg']
 
-          unless missing_claims.empty?
-            add_request_message('error', "JWT payload missing required claims: #{missing_claims_string}", index)
-            next
+          # Continue checking the rest of the token even when one check fails, so the tester sees every
+          # issue at once rather than fixing them one error at a time.
+          # CDS Hooks prohibits the `none` algorithm and symmetric (HMAC) algorithms for the authentication JWT.
+          if alg.to_s.match?(/\A(none|hs\d+)\z/i)
+            add_request_message('error',
+                                "Token signature algorithm #{alg.inspect} is not permitted; CDS Hooks prohibits " \
+                                'the `none` algorithm and symmetric (HMAC) algorithms.', index)
           end
+
+          begin
+            JWT.decode(
+              auth_tokens_list[index],
+              JWT::JWK.import(jwk).public_key,
+              true,
+              algorithms: [alg],
+              exp_leeway: 60,
+              iss: cds_jwt_iss,
+              aud: public_hook_url(request),
+              verify_not_before: false,
+              verify_iat: false,
+              verify_jti: true,
+              verify_iss: true,
+              verify_aud: true
+            )
+          rescue StandardError => e
+            add_request_message('error', "Token validation error: #{e.message}", index)
+          end
+
+          missing_claims = required_claims - unverified_payload.keys
+          next if missing_claims.empty?
+
+          missing_claims_string = missing_claims.map { |claim| "`#{claim}`" }.join(', ')
+          add_request_message('error', "JWT payload missing required claims: #{missing_claims_string}", index)
         end
         assert_no_error_messages("#{requests_with_errors_prefix}Token payload is missing required claims or " \
                                  'does not have a valid signature. See Messages for details.')

data/lib/davinci_crd_test_kit/client/v2.2.1/cds-services-prefetch-subset-v221.json

@@ -66,18 +66,19 @@
       }
     },
     {
-      "hook": "encounter-discharge",
-      "title": "Encounter Disharge CDS Service Example",
-      "description": "A simulated CDS Service requesting a subset of the standard prefetches that is invoked when the user is performing the discharge process for an encounter - typically an inpatient encounter.",
-      "id": "encounter-discharge-subset",
-      "prefetch" : {
+      "hook": "order-select",
+      "title": "Order Select CDS Service",
+      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a clinician selects one or more orders to place for a patient",
+      "id": "order-select-subset",
+      "prefetch": {
         "pat": "Patient/{{context.patientId}}",
         "enc": "Encounter/{{context.encounterId}}",
-        "cov": "Coverage?patient={{context.patientId}}&status=active",
-        "roles" : "PractitionerRole?_id={{%enc.participant.individual.resolve().ofType(PractitionerRole).id}}",
-        "pracs" : "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|%enc.participant.individual.resolve().ofType(Practitioner).id}}",
-        "orgs" : "Organization?_id={{%roles.entry.resource.organization.resolve().id}}",
-        "locs" : "Location?_id={{%roles.entry.resource.location.resolve().id}}"
+        "cov": "Coverage?patient={{context.patientId}}&status=active",        
+        "devs": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
+        "meds": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
+        "roles": "PractitionerRole?_id={{context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
+        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id}}",
+        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -96,25 +97,19 @@
       }
     },
     {
-      "hook": "order-dispatch",
-      "title": "Order Dispatch CDS Service Example",
-      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a practitioner is selecting a candidate performer for a pre-existing order that was not tied to a specific performer",
-      "id": "order-dispatch-subset",
+      "hook": "order-sign",
+      "title": "Order Sign CDS Service",
+      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a clinician is ready to sign one or more orders for a patient",
+      "id": "order-sign-subset",
       "prefetch": {
         "pat": "Patient/{{context.patientId}}",
         "enc": "Encounter/{{context.encounterId}}",
-        "cov": "Coverage?patient={{context.patientId}}&status=active",
-	      "comReqs": "CommunicationRequest?_id={{context.dispatchedOrders.resolve().ofType(CommunicationRequest).id}}",
-	      "devReqs": "DeviceRequest?_id={{context.dispatchedOrders.resolve().ofType(DeviceRequest).id}}",
-        "medReqs": "MedicationRequest?_id={{context.dispatchedOrders.resolve().ofType(MedicationRequest).id}}",
-        "nutOrds": "NutritionOrder?_id={{context.dispatchedOrders.resolve().ofType(NutritionOrder).id}}",
-        "servReqs": "ServiceRequest?_id={{context.dispatchedOrders.resolve().ofType(ServiceRequest).id}}",
-	      "visRxs": "VisionPrescription?_id={{context.dispatchedOrders.resolve().ofType(VisionPrescription).id}}",
-        "devs": "Device?_id={{%devReqs.entry.resource.code.resolve().id}}",
-        "meds": "Medication?_id={{%medReqs.entry.resource.medication.resolve().id}}",
-        "roles": "PractitionerRole?_id={{%comReqs.entry.resource.sender.resolve().ofType(PractitionerRole).id|%comReqs.entry.resource.recipient.resolve().ofType(PractitionerRole).id|%devReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id|%medReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id|%servReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
-        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|%comReqs.entry.resource.sender.resolve().ofType(Practitioner).id|%comReqs.entry.resource.recipient.resolve().ofType(Practitioner).id|%devReqs.entry.resource.performer.resolve().ofType(Practitioner).id|%medReqs.entry.resource.performer.resolve().ofType(Practitioner).id|%servReqs.entry.resource.performer.resolve().ofType(Practitioner).id}}",
-        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|%servReqs.entry.resource.locationReference.resolve().id}}"
+        "cov": "Coverage?patient={{context.patientId}}&status=active",        
+        "devs": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
+        "meds": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
+        "roles": "PractitionerRole?_id={{context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
+        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id}}",
+        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -133,19 +128,25 @@
       }
     },
     {
-      "hook": "order-select",
-      "title": "Order Select CDS Service",
-      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a clinician selects one or more orders to place for a patient",
-      "id": "order-select-subset",
+      "hook": "order-dispatch",
+      "title": "Order Dispatch CDS Service Example",
+      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a practitioner is selecting a candidate performer for a pre-existing order that was not tied to a specific performer",
+      "id": "order-dispatch-subset",
       "prefetch": {
         "pat": "Patient/{{context.patientId}}",
         "enc": "Encounter/{{context.encounterId}}",
-        "cov": "Coverage?patient={{context.patientId}}&status=active",        
-        "devs": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
-        "meds": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
-        "roles": "PractitionerRole?_id={{context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
-        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id}}",
-        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
+        "cov": "Coverage?patient={{context.patientId}}&status=active",
+	      "comReqs": "CommunicationRequest?_id={{context.dispatchedOrders.resolve().ofType(CommunicationRequest).id}}",
+	      "devReqs": "DeviceRequest?_id={{context.dispatchedOrders.resolve().ofType(DeviceRequest).id}}",
+        "medReqs": "MedicationRequest?_id={{context.dispatchedOrders.resolve().ofType(MedicationRequest).id}}",
+        "nutOrds": "NutritionOrder?_id={{context.dispatchedOrders.resolve().ofType(NutritionOrder).id}}",
+        "servReqs": "ServiceRequest?_id={{context.dispatchedOrders.resolve().ofType(ServiceRequest).id}}",
+	      "visRxs": "VisionPrescription?_id={{context.dispatchedOrders.resolve().ofType(VisionPrescription).id}}",
+        "devs": "Device?_id={{%devReqs.entry.resource.code.resolve().id}}",
+        "meds": "Medication?_id={{%medReqs.entry.resource.medication.resolve().id}}",
+        "roles": "PractitionerRole?_id={{%comReqs.entry.resource.sender.resolve().ofType(PractitionerRole).id|%comReqs.entry.resource.recipient.resolve().ofType(PractitionerRole).id|%devReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id|%medReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id|%servReqs.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
+        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|%comReqs.entry.resource.sender.resolve().ofType(Practitioner).id|%comReqs.entry.resource.recipient.resolve().ofType(Practitioner).id|%devReqs.entry.resource.performer.resolve().ofType(Practitioner).id|%medReqs.entry.resource.performer.resolve().ofType(Practitioner).id|%servReqs.entry.resource.performer.resolve().ofType(Practitioner).id}}",
+        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|%servReqs.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -164,19 +165,18 @@
       }
     },
     {
-      "hook": "order-sign",
-      "title": "Order Sign CDS Service",
-      "description": "A simulated CDS Service requesting a subset of the standard prefetches that fires when a clinician is ready to sign one or more orders for a patient",
-      "id": "order-sign-subset",
-      "prefetch": {
+      "hook": "encounter-discharge",
+      "title": "Encounter Disharge CDS Service Example",
+      "description": "A simulated CDS Service requesting a subset of the standard prefetches that is invoked when the user is performing the discharge process for an encounter - typically an inpatient encounter.",
+      "id": "encounter-discharge-subset",
+      "prefetch" : {
         "pat": "Patient/{{context.patientId}}",
         "enc": "Encounter/{{context.encounterId}}",
-        "cov": "Coverage?patient={{context.patientId}}&status=active",        
-        "devs": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
-        "meds": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
-        "roles": "PractitionerRole?_id={{context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id}}",
-        "pracs": "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id}}",
-        "locs": "Location?_id={{%roles.entry.resource.location.resolve().id|%enc.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
+        "cov": "Coverage?patient={{context.patientId}}&status=active",
+        "roles" : "PractitionerRole?_id={{%enc.participant.individual.resolve().ofType(PractitionerRole).id}}",
+        "pracs" : "Practitioner?_id={{%roles.entry.resource.practitioner.resolve().id|%enc.participant.individual.resolve().ofType(Practitioner).id}}",
+        "orgs" : "Organization?_id={{%roles.entry.resource.organization.resolve().id}}",
+        "locs" : "Location?_id={{%roles.entry.resource.location.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [

data/lib/davinci_crd_test_kit/client/v2.2.1/cds-services-v221.json

@@ -67,18 +67,20 @@
       }
     },
     {
-      "hook": "encounter-discharge",
-      "title": "Encounter Disharge CDS Service Example",
-      "description": "A simulated CDS Service that is invoked when the user is performing the discharge process for an encounter - typically an inpatient encounter.",
-      "id": "encounter-discharge-service",
-      "prefetch" : {
+      "hook": "order-select",
+      "title": "Order Select CDS Service",
+      "description": "A simulated CDS Service that fires when a clinician selects one or more orders to place for a patient",
+      "id": "order-select-service",
+      "prefetch": {
         "patient": "Patient/{{context.patientId}}",
         "encounter": "Encounter/{{context.encounterId}}",
-        "coverage": "Coverage?patient={{context.patientId}}&status=active",
-        "practitionerRoles" : "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id}}",
-        "practitioners" : "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id}}",
-        "organizations" : "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id}}",
-        "locations" : "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id}}"
+        "coverage": "Coverage?patient={{context.patientId}}&status=active",        
+        "devices": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
+        "medications": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
+        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.requester.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
+        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.requester.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
+        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|context.draftOrders.entry.resource.dispenseRequest.performer.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Organization).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Organization).id|context.draftOrders.entry.resource.performer.resolve().ofType(Organization).id}}",
+        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -97,26 +99,20 @@
       }
     },
     {
-      "hook": "order-dispatch",
-      "title": "Order Dispatch CDS Service Example",
-      "description": "A simulated CDS Service that fires when a practitioner is selecting a candidate performer for a pre-existing order that was not tied to a specific performer",
-      "id": "order-dispatch-service",
+      "hook": "order-sign",
+      "title": "Order Sign CDS Service",
+      "description": "A simulated CDS Service that fires when a clinician is ready to sign one or more orders for a patient",
+      "id": "order-sign-service",
       "prefetch": {
         "patient": "Patient/{{context.patientId}}",
         "encounter": "Encounter/{{context.encounterId}}",
-        "coverage": "Coverage?patient={{context.patientId}}&status=active",
-	      "communicationRequests": "CommunicationRequest?_id={{context.dispatchedOrders.resolve().ofType(CommunicationRequest).id}}",
-	      "deviceRequests": "DeviceRequest?_id={{context.dispatchedOrders.resolve().ofType(DeviceRequest).id}}",
-        "medicationRequests": "MedicationRequest?_id={{context.dispatchedOrders.resolve().ofType(MedicationRequest).id}}",
-        "nutritionOrders": "NutritionOrder?_id={{context.dispatchedOrders.resolve().ofType(NutritionOrder).id}}",
-        "serviceRequests": "ServiceRequest?_id={{context.dispatchedOrders.resolve().ofType(ServiceRequest).id}}",
-	      "visionPrescriptions": "VisionPrescription?_id={{context.dispatchedOrders.resolve().ofType(VisionPrescription).id}}",
-        "devices": "Device?_id={{%deviceRequests.entry.resource.code.resolve().id}}",
-        "medications": "Medication?_id={{%medicationRequests.entry.resource.medication.resolve().id}}",
-        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.sender.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.recipient.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%deviceRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%deviceRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%medicationRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%medicationRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%serviceRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%serviceRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%nutritionOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|%visionPrescriptions.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
-        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.sender.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.recipient.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%deviceRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%deviceRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%medicationRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%medicationRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%serviceRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%serviceRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%nutritionOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|%visionPrescriptions.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
-        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|%communicationRequests.entry.resource.recipient.resolve().ofType(Organization).id|%communicationRequests.entry.resource.sender.resolve().ofType(Organization).id|%medicationRequests.entry.resource.dispenseRequest.performer.resolve().id|%serviceRequests.entry.resource.performer.resolve().ofType(Organization).id}}",
-        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|%serviceRequests.entry.resource.locationReference.resolve().id}}"
+        "coverage": "Coverage?patient={{context.patientId}}&status=active",        
+        "devices": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
+        "medications": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
+        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.requester.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
+        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.requester.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
+        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|context.draftOrders.entry.resource.dispenseRequest.performer.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Organization).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Organization).id|context.draftOrders.entry.resource.performer.resolve().ofType(Organization).id}}",
+        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -135,20 +131,26 @@
       }
     },
     {
-      "hook": "order-select",
-      "title": "Order Select CDS Service",
-      "description": "A simulated CDS Service that fires when a clinician selects one or more orders to place for a patient",
-      "id": "order-select-service",
+      "hook": "order-dispatch",
+      "title": "Order Dispatch CDS Service Example",
+      "description": "A simulated CDS Service that fires when a practitioner is selecting a candidate performer for a pre-existing order that was not tied to a specific performer",
+      "id": "order-dispatch-service",
       "prefetch": {
         "patient": "Patient/{{context.patientId}}",
         "encounter": "Encounter/{{context.encounterId}}",
-        "coverage": "Coverage?patient={{context.patientId}}&status=active",        
-        "devices": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
-        "medications": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
-        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.requester.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
-        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.requester.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
-        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|context.draftOrders.entry.resource.dispenseRequest.performer.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Organization).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Organization).id|context.draftOrders.entry.resource.performer.resolve().ofType(Organization).id}}",
-        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
+        "coverage": "Coverage?patient={{context.patientId}}&status=active",
+	      "communicationRequests": "CommunicationRequest?_id={{context.dispatchedOrders.resolve().ofType(CommunicationRequest).id}}",
+	      "deviceRequests": "DeviceRequest?_id={{context.dispatchedOrders.resolve().ofType(DeviceRequest).id}}",
+        "medicationRequests": "MedicationRequest?_id={{context.dispatchedOrders.resolve().ofType(MedicationRequest).id}}",
+        "nutritionOrders": "NutritionOrder?_id={{context.dispatchedOrders.resolve().ofType(NutritionOrder).id}}",
+        "serviceRequests": "ServiceRequest?_id={{context.dispatchedOrders.resolve().ofType(ServiceRequest).id}}",
+	      "visionPrescriptions": "VisionPrescription?_id={{context.dispatchedOrders.resolve().ofType(VisionPrescription).id}}",
+        "devices": "Device?_id={{%deviceRequests.entry.resource.code.resolve().id}}",
+        "medications": "Medication?_id={{%medicationRequests.entry.resource.medication.resolve().id}}",
+        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.sender.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.recipient.resolve().ofType(PractitionerRole).id|%communicationRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%deviceRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%deviceRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%medicationRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%medicationRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%serviceRequests.entry.resource.performer.resolve().ofType(PractitionerRole).id|%serviceRequests.entry.resource.requester.resolve().ofType(PractitionerRole).id|%nutritionOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|%visionPrescriptions.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
+        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.sender.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.recipient.resolve().ofType(Practitioner).id|%communicationRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%deviceRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%deviceRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%medicationRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%medicationRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%serviceRequests.entry.resource.performer.resolve().ofType(Practitioner).id|%serviceRequests.entry.resource.requester.resolve().ofType(Practitioner).id|%nutritionOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|%visionPrescriptions.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
+        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|%communicationRequests.entry.resource.recipient.resolve().ofType(Organization).id|%communicationRequests.entry.resource.sender.resolve().ofType(Organization).id|%medicationRequests.entry.resource.dispenseRequest.performer.resolve().id|%serviceRequests.entry.resource.performer.resolve().ofType(Organization).id}}",
+        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|%serviceRequests.entry.resource.locationReference.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [
@@ -167,20 +169,18 @@
       }
     },
     {
-      "hook": "order-sign",
-      "title": "Order Sign CDS Service",
-      "description": "A simulated CDS Service that fires when a clinician is ready to sign one or more orders for a patient",
-      "id": "order-sign-service",
-      "prefetch": {
+      "hook": "encounter-discharge",
+      "title": "Encounter Disharge CDS Service Example",
+      "description": "A simulated CDS Service that is invoked when the user is performing the discharge process for an encounter - typically an inpatient encounter.",
+      "id": "encounter-discharge-service",
+      "prefetch" : {
         "patient": "Patient/{{context.patientId}}",
         "encounter": "Encounter/{{context.encounterId}}",
-        "coverage": "Coverage?patient={{context.patientId}}&status=active",        
-        "devices": "Device?_id={{context.draftOrders.entry.resource.ofType(DeviceRequest).code.resolve().id}}",
-        "medications": "Medication?_id={{context.draftOrders.entry.resource.ofType(MedicationRequest).medication.resolve().id}}",
-        "practitionerRoles": "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.sender.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.recipient.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.requester.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.performer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.orderer.resolve().ofType(PractitionerRole).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(PractitionerRole).id}}",
-        "practitioners": "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.sender.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.requester.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.performer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.orderer.resolve().ofType(Practitioner).id|context.draftOrders.entry.resource.prescriber.resolve().ofType(Practitioner).id}}",
-        "organizations": "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id|context.draftOrders.entry.resource.dispenseRequest.performer.resolve().id|context.draftOrders.entry.resource.sender.resolve().ofType(Organization).id|context.draftOrders.entry.resource.recipient.resolve().ofType(Organization).id|context.draftOrders.entry.resource.performer.resolve().ofType(Organization).id}}",
-        "locations": "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id|context.draftOrders.entry.resource.locationReference.resolve().id}}"
+        "coverage": "Coverage?patient={{context.patientId}}&status=active",
+        "practitionerRoles" : "PractitionerRole?_id={{%encounter.participant.individual.resolve().ofType(PractitionerRole).id}}",
+        "practitioners" : "Practitioner?_id={{%practitionerRoles.entry.resource.practitioner.resolve().id|%encounter.participant.individual.resolve().ofType(Practitioner).id}}",
+        "organizations" : "Organization?_id={{%practitionerRoles.entry.resource.organization.resolve().id|%encounter.serviceProvider.resolve().ofType(Organization).id}}",
+        "locations" : "Location?_id={{%practitionerRoles.entry.resource.location.resolve().id|%encounter.location.location.resolve().id}}"
       },
       "extension" : {
         "davinci-crd.version" : [