Fixed dependency issue that was causing errors with cds hooks request…

…s ... added cds hooks tests and fixed measure processing tests
cqframework · Nov 25, 2017 · 58b2a32 · 58b2a32
1 parent ed3445b
commit 58b2a32
Show file tree

Hide file tree

Showing 43 changed files with 7,880 additions and 13,960 deletions.
diff --git a/...ol/codesystems/2.16.840.1.113883.6.5.json → ...ol/codesystems/2.16.840.1.113883.6.4.json b/...ol/codesystems/2.16.840.1.113883.6.5.json → ...ol/codesystems/2.16.840.1.113883.6.4.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "CodeSystem",
-  "id": "2.16.840.1.113883.6.5",
+  "id": "2.16.840.1.113883.6.4",
   "meta": {
     "versionId": "2",
     "lastUpdated": "2016-09-20T21:25:23.000+00:00"

diff --git a/examples/quality-summit-cds/cds/bcs/bcs-library.json b/examples/quality-summit-cds/cds/bcs/bcs-library.json
diff --git a/examples/quality-summit-cds/cds/bcs/request.json b/examples/quality-summit-cds/cds/bcs/request.json
@@ -1,6 +1,6 @@
 {
   "hookInstance": "d1577c69-dfbe-44ad-ba6d-3e05e953b2ea",
-  "fhirServer": "https://sb-fhir-dstu2.smarthealthit.org/smartdstu2/open",
+  "fhirServer": "http://localhost:8080/cqf-ruler/baseDstu3",
   "hook": "patient-view",
   "user": "Practitioner/example",
   "context": [],

diff --git a/examples/quality-summit-cds/cds/ccs/request.json b/examples/quality-summit-cds/cds/ccs/request.json
@@ -1,6 +1,6 @@
 {
   "hookInstance": "d1577c69-dfbe-44ad-ba6d-3e05e953b2ea",
-  "fhirServer": "https://sb-fhir-dstu2.smarthealthit.org/smartdstu2/open",
+  "fhirServer": "http://localhost:8080/cqf-ruler/baseDstu3",
   "hook": "patient-view",
   "user": "Practitioner/example",
   "context": [],

diff --git a/examples/quality-summit-cds/cds/col/request.json b/examples/quality-summit-cds/cds/col/request.json
@@ -1,6 +1,6 @@
 {
   "hookInstance": "d1577c69-dfbe-44ad-ba6d-3e05e953b2ea",
-  "fhirServer": "https://sb-fhir-dstu2.smarthealthit.org/smartdstu2/open",
+  "fhirServer": "http://localhost:8080/cqf-ruler/baseDstu3",
   "hook": "patient-view",
   "user": "Practitioner/example",
   "context": [],

diff --git a/pom.xml b/pom.xml
@@ -31,13 +31,13 @@
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>cql-engine</artifactId>
-            <version>1.2.36-SNAPSHOT</version>
+            <version>1.2.37-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>cql-engine-fhir</artifactId>
-            <version>1.2.36-SNAPSHOT</version>
+            <version>1.2.37-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -76,11 +76,11 @@
             <version>2.8.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.0</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.google.code.gson</groupId>-->
+            <!--<artifactId>gson</artifactId>-->
+            <!--<version>2.8.0</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/resources/codesystems/2.16.840.1.113883.6.1.json b/src/main/resources/codesystems/2.16.840.1.113883.6.1.json