diff --git a/docker-compose.yml b/docker-compose.yml
index ecec6c25..7fada739 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,7 +139,7 @@ services:
condition: service_healthy
environment:
ELASTIC_HOST: http://dataportal-elastic:9200
- ELASTIC_GIT_TAG: v3.0.0-test.7
+ ELASTIC_GIT_TAG: v3.0.0-alpha
ELASTIC_FILEPATH: https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/TAGPLACEHOLDER/example/fdpg-ontology/
ELASTIC_FILENAME: elastic.zip
# if set to false, existing indices are not overridden.
diff --git a/pom.xml b/pom.xml
index b689735b..4dd66fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
17
4.10.0
4.10.0
- v3.0.0-test.11
+ v3.0.0-alpha
diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/QueryTranslatorSpringConfig.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/QueryTranslatorSpringConfig.java
index 11c8f2dd..6f246e41 100644
--- a/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/QueryTranslatorSpringConfig.java
+++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/QueryTranslatorSpringConfig.java
@@ -86,30 +86,41 @@ Translator createCqlTranslator(@Qualifier("translation") ObjectMapper jsonUtil)
Stream.of(mappings)
.collect(Collectors.toMap(Mapping::key, Function.identity(), (a, b) -> a)),
mappingTreeBase,
- Map.ofEntries(entry("http://fhir.de/CodeSystem/bfarm/icd-10-gm", "icd10"),
- entry("mii.abide", "abide"),
- entry("http://fhir.de/CodeSystem/bfarm/ops", "ops"),
- entry("http://dicom.nema.org/resources/ontology/DCM", "dcm"),
- entry("https://www.medizininformatik-initiative.de/fhir/core/modul-person/CodeSystem/Vitalstatus", "vitalstatus"),
- entry("http://loinc.org", "loinc"),
- entry("https://fhir.bbmri.de/CodeSystem/SampleMaterialType", "sample"),
- entry("http://fhir.de/CodeSystem/bfarm/atc", "atc"),
- entry("http://snomed.info/sct", "snomed"),
- entry("http://terminology.hl7.org/CodeSystem/condition-ver-status", "cvs"),
- entry("http://hl7.org/fhir/administrative-gender", "gender"),
- entry("urn:oid:1.2.276.0.76.5.409", "urn409"),
- entry(
- "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes",
- "numecrf"),
- entry("urn:iso:std:iso:3166", "iso3166"),
- entry("https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score",
- "frailtyscore"),
- entry("http://terminology.hl7.org/CodeSystem/consentcategorycodes", "consentcategory"),
- entry("urn:oid:2.16.840.1.113883.3.1937.777.24.5.3", "consent"),
- entry("http://hl7.org/fhir/sid/icd-o-3", "icdo3"),
- entry("http://hl7.org/fhir/consent-provision-type", "provisiontype"))));
+ Map.ofEntries(entry("http://fhir.de/CodeSystem/bfarm/icd-10-gm", "icd10"),
+ entry("mii.abide", "abide"),
+ entry("http://fhir.de/CodeSystem/bfarm/ops", "ops"),
+ entry("http://dicom.nema.org/resources/ontology/DCM", "dcm"),
+ entry("https://www.medizininformatik-initiative.de/fhir/core/modul-person/CodeSystem/Vitalstatus", "vitalstatus"),
+ entry("http://loinc.org", "loinc"),
+ entry("https://fhir.bbmri.de/CodeSystem/SampleMaterialType", "sample"),
+ entry("http://fhir.de/CodeSystem/bfarm/atc", "atc"),
+ entry("http://snomed.info/sct", "snomed"),
+ entry("http://terminology.hl7.org/CodeSystem/condition-ver-status", "cvs"),
+ entry("http://hl7.org/fhir/administrative-gender", "gender"),
+ entry("urn:oid:1.2.276.0.76.5.409", "urn409"),
+ entry(
+ "https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/ecrf-parameter-codes",
+ "numecrf"),
+ entry("urn:iso:std:iso:3166", "iso3166"),
+ entry("https://www.netzwerk-universitaetsmedizin.de/fhir/CodeSystem/frailty-score",
+ "frailtyscore"),
+ entry("http://terminology.hl7.org/CodeSystem/consentcategorycodes", "consentcategory"),
+ entry("urn:oid:2.16.840.1.113883.3.1937.777.24.5.3", "consent"),
+ entry("http://hl7.org/fhir/sid/icd-o-3", "icdo3"),
+ entry("fdpg.mii.cds", "fdpgmiicds"),
+ entry("http://fhir.de/CodeSystem/bfarm/alpha-id", "alphaid"),
+ entry("urn:iso:std:iso:11073:10101", "ISO11073"),
+ entry("http://terminology.hl7.org/CodeSystem/icd-o-3", "icdo3"),
+ entry("http://fhir.de/CodeSystem/dkgev/Fachabteilungsschluessel", "fachabteilungsschluessel"),
+ entry("http://terminology.hl7.org/CodeSystem/v3-ActCode", "v3actcode"),
+ entry("http://fhir.de/CodeSystem/dkgev/Fachabteilungsschluessel-erweitert", "fachabteilungsschluesselerweitert"),
+ entry("http://fhir.de/CodeSystem/kontaktart-de", "kontaktart"),
+ entry("http://hl7.org/fhir/sid/icd-10", "sidicd10"),
+ entry("http://fhir.de/CodeSystem/Kontaktebene", "kontaktebene"),
+ entry("http://hl7.org/fhir/consent-provision-type", "provisiontype"))));
}
+
@Qualifier("cql")
@Lazy
@Bean