Fix Problem with Fixed Criteria in Consent

Closes: #165
medizininformatik-initiative · Dec 9, 2024 · 2ef655a · 2ef655a
1 parent 56ca581
commit 2ef655a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         <hapi-fhir.version>7.6.0</hapi-fhir.version>
         <testcontainers.version>1.20.4</testcontainers.version>
         <slf4j.version>2.0.16</slf4j.version>
-        <ontology.version>3.0.0</ontology.version>
+        <ontology.version>3.0.1</ontology.version>
     </properties>
 
     <dependencies>
@@ -177,7 +177,7 @@
                             <goal>download-single</goal>
                         </goals>
                         <configuration>
-                            <url>https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/v${ontology.version}/example/fdpg-ontology/mapping.zip</url>
+                            <url>https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/v${ontology.version}/mapping.zip</url>
                             <toDir>${project.build.directory}</toDir>
                         </configuration>
                     </execution>

diff --git a/src/test/resources/de/numcodex/sq2cql/returningOnePatient/Consent.json b/src/test/resources/de/numcodex/sq2cql/returningOnePatient/Consent.json
@@ -0,0 +1,23 @@
+{
+  "version": "http://to_be_decided.com/draft-1/schema#",
+  "display": "Ausgewählte Merkmale",
+  "inclusionCriteria": [
+    [
+      {
+        "termCodes": [
+          {
+            "code": "yes-yes-no-no",
+            "display": "Verteilte, EU-DSGVO konforme Analyse, ohne Krankenkassendaten, und ohne Rekontaktierung",
+            "system": "fdpg.consent.combined"
+          }
+        ],
+        "context": {
+          "code": "Einwilligung",
+          "display": "Einwilligung",
+          "system": "fdpg.mii.cds",
+          "version": "1.0.0"
+        }
+      }
+    ]
+  ]
+}
diff --git a/src/test/resources/de/numcodex/sq2cql/testData.json b/src/test/resources/de/numcodex/sq2cql/testData.json
@@ -308,8 +308,8 @@
         },
         "category": [ {
           "coding": [ {
-            "system": "https://www.medizininformatik-initiative.de/fhir/modul-consent/CodeSystem/mii-cs-consent-consent_category",
-            "code": "2.16.840.1.113883.3.1937.777.24.2.184"
+            "system": "http://loinc.org",
+            "code": "57016-8"
           } ]
         } ],
         "patient": {
@@ -430,6 +430,19 @@
                 "display": "MDAT_wissenschaftlich_nutzen_EU_DSGVO_NIVEAU"
               } ]
             } ]
+          },{
+            "type": "permit",
+            "period": {
+              "start": "2016-01-15T07:39:20+01:00",
+              "end": "2016-06-23T07:39:20+01:00"
+            },
+            "code": [ {
+                "coding": [ {
+                "code": "2.16.840.1.113883.3.1937.777.24.5.3.46",
+                "display": "MDAT retrospektiv wissenschaftlich nutzen EU DSGVO NIVEAU",
+                "system": "urn:oid:2.16.840.1.113883.3.1937.777.24.5.3"
+              } ]
+            } ]
           }, {
             "type": "permit",
             "period": {