Skip to content

Commit

Permalink
#382 - Change display and translations structure for criteria and con…
Browse files Browse the repository at this point in the history 
…cepts

- fix es files in tests
  • Loading branch information
@michael-82
michael-82 committed Dec 6, 2024
1 parent c02fd83 commit cf33c97
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,11 @@ services:
environment:
ES_HOST: http://dataportal-elastic
ES_PORT: 9200
ONTO_GIT_TAG: v3.0.0
ONTO_GIT_TAG: v3.0.1-alpha.0
ONTO_REPO: https://github.com/medizininformatik-initiative/fhir-ontology-generator/raw/
ONTO_RELATIVE_PATH: /example/fdpg-ontology/
DOWNLOAD_FILENAME: elastic.zip
EXIT_ON_EXISTING_INDICES: false
FORCE_INDEX_CREATION: true

volumes:
dataportal-postgres-data:
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/de/numcodex/feasibility_gui_backend/terminology/es/cc_testdata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{"index": {"_index": "codeable_concept", "_id": "A1.0"}}
{"termcode": {"code": "A1.0", "display": "foo", "system": "some-system", "version": 2010}, "display": {"original": "some-system", "en-US": "some-system", "de-DE": "some-system"}, "value_sets": []}
{"termcode": {"code": "A1.0", "display": "foo", "system": "some-system", "version": 2010}, "display": {"original": "some-system", "en": "some-system", "de": "some-system"}, "value_sets": []}
{"index": {"_index": "codeable_concept", "_id": "A1.1"}}
{"termcode": {"code": "A1.1", "display": "bar", "system": "another-system", "version": 2012}, "display": {"original": "another-system", "en-US": "another-system", "de-DE": "another-system"} ,"value_sets": ["some-value-set"]}
{"termcode": {"code": "A1.1", "display": "bar", "system": "another-system", "version": 2012}, "display": {"original": "another-system", "en": "another-system", "de": "another-system"} ,"value_sets": ["some-value-set"]}
{"index": {"_index": "codeable_concept", "_id": "A2.0"}}
{"termcode": {"code": "A2.0", "display": "baz", "system": "some-system", "version": 2023}, "display": {"original": "some-system", "en-US": "some-system", "de-DE": "some-system"},"value_sets": []}
{"termcode": {"code": "A2.0", "display": "baz", "system": "some-system", "version": 2023}, "display": {"original": "some-system", "en": "some-system", "de": "some-system"},"value_sets": []}
4 changes: 2 additions & 2 deletions src/test/resources/de/numcodex/feasibility_gui_backend/terminology/es/codeable_concept.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@
"type": "text",
"index": false
},
"de-DE": {
"de": {
"type": "text",
"analyzer": "edge_ngram_analyzer_include_punctuation",
"search_analyzer": "lowercase_analyzer"
},
"en-US": {
"en": {
"type": "text",
"analyzer": "edge_ngram_analyzer_include_punctuation",
"search_analyzer": "lowercase_analyzer"
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/de/numcodex/feasibility_gui_backend/terminology/es/ontology.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@
"type": "text",
"index": false
},
"de-DE": {
"de": {
"type": "text",
"analyzer": "edge_ngram_analyzer_include_punctuation",
"search_analyzer": "lowercase_analyzer"
},
"en-US": {
"en": {
"type": "text",
"analyzer": "edge_ngram_analyzer_include_punctuation",
"search_analyzer": "lowercase_analyzer"
Expand Down
10 changes: 5 additions & 5 deletions src/test/resources/de/numcodex/feasibility_gui_backend/terminology/es/ontology_testdata.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{"index": {"_index": "ontology", "_id": "ff34833f-4c39-30fc-87fb-34300a5507a1"}}
{"display": {"original": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion", "en-US": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion", "de-DE": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion"}, "availability": 5013, "terminology": "http://fhir.de/CodeSystem/bfarm/ops", "termcode": "5-925.gb", "selectable": true, "context": {"code": "Procedure", "display": "Prozedur", "system": "fdpg.mii.cds", "version": "1.0.0"}, "termcodes": [{"code": "5-925.gb", "display": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Ver\u00e4tzungen, Empf\u00e4ngerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, gro\u00dffl\u00e4chig: Bauchregion", "system": "http://fhir.de/CodeSystem/bfarm/ops", "version": "2024"}], "parents": [{"name": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Ver\u00e4tzungen, Empf\u00e4ngerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, gro\u00dffl\u00e4chig", "contextualized_termcode_hash": "a131cd96-5a43-3fb0-9385-92c92aa91e8a"}], "children": [], "criteria_sets": [], "related_terms": []}
{"index": {"_index": "ontology", "_id": "e8ae80c5-584d-3453-915a-a58f989a8cfd"}}
{"name": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion", "availability": 0, "terminology": "http://fhir.de/CodeSystem/bfarm/ops", "termcode": "5-925.gb", "selectable": true, "context": {"system": "fdpg.mii.cds", "code": "Procedure", "display": "Prozedur", "version": "1.0.0"}, "termcodes": [{"system": "http://fhir.de/CodeSystem/bfarm/ops", "code": "5-925.gb", "display": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion", "version": "2024"}], "criteria_sets": [], "display": {"original": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion", "en": "Free skin transplantation and flap plasty on skin and subcutaneous tissue for burns and chemical burns, recipient site: Permanent skin replacement by allogenic skin graft, large area: Abdominal region", "de": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig: Bauchregion"}, "parents": [{"name": "Freie Hauttransplantation und Lappenplastik an Haut und Unterhaut bei Verbrennungen und Verätzungen, Empfängerstelle: Permanenter Hautersatz durch allogenes Hauttransplantat, großflächig", "contextualized_termcode_hash": "e81b478d-3107-31b2-bf92-8287a1d13c6a"}], "children": [], "related_terms": [], "kds_module": "Prozedur"}
{"index": {"_index": "ontology", "_id": "3ceb21b3-5bd8-30b4-bb18-b222fb7fc748"}}
{"display": {"original": "Abnormer Blutdruckwert ohne Diagnose", "en-US": "Abnormer Blutdruckwert ohne Diagnose", "de-DE": "Abnormer Blutdruckwert ohne Diagnose"}, "availability": 6398, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03", "selectable": true, "context": {"code": "Diagnose", "display": "Diagnose", "system": "fdpg.mii.cds", "version": "1.0.0"}, "termcodes": [{"code": "R03", "display": "Abnormer Blutdruckwert ohne Diagnose", "system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "version": "2024"}], "parents": [{"name": "Symptome, die das Kreislaufsystem und das Atmungssystem betreffen", "contextualized_termcode_hash": "d93ef2d0-31a4-3eaf-b16e-f945fd600307"}], "children": [{"name": "Erh\u00f6hter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "contextualized_termcode_hash": "e2fcb288-0d08-3272-8f32-64b8f1cfe095"}, {"name": "Unspezifischer niedriger Blutdruckwert", "contextualized_termcode_hash": "e48709d5-56dd-36e0-9da5-813aa9cbdaea"}], "criteria_sets": [], "related_terms": []}
{"name": "Abnormer Blutdruckwert ohne Diagnose", "availability": 0, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03", "selectable": true, "context": {"system": "fdpg.mii.cds", "code": "Diagnose", "display": "Diagnose", "version": "1.0.0"}, "termcodes": [{"system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "code": "R03", "display": "Abnormer Blutdruckwert ohne Diagnose", "version": "2024"}], "criteria_sets": ["http://fdpg.mii.cds/CriteriaSet/Diagnose/icd-10-gm"], "display": {"original": "Abnormer Blutdruckwert ohne Diagnose", "en": "Abnormal blood pressure value without diagnosis", "de": "Abnormer Blutdruckwert ohne Diagnose"}, "parents": [{"name": "Symptome, die das Kreislaufsystem und das Atmungssystem betreffen", "contextualized_termcode_hash": "9b12a688-b786-37ef-95ef-bc96ec96e438"}], "children": [{"name": "Unspezifischer niedriger Blutdruckwert", "contextualized_termcode_hash": "1f2da8e5-15c8-33b3-85a5-075482a90eb5"}, {"name": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "contextualized_termcode_hash": "1026c3ef-9f0a-3db3-94e7-7615c8041706"}], "related_terms": [], "kds_module": "Diagnose"}
{"index": {"_index": "ontology", "_id": "e2fcb288-0d08-3272-8f32-64b8f1cfe095"}}
{"display": {"original": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "en-US": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "de-DE": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks"}, "availability": 1523, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03.0", "selectable": true, "context": {"code": "Diagnose", "display": "Diagnose", "system": "fdpg.mii.cds", "version": "1.0.0"}, "termcodes": [{"code": "R03.0", "display": "Erh\u00f6hter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "version": "2024"}], "parents": [{"name": "Abnormer Blutdruckwert ohne Diagnose", "contextualized_termcode_hash": "3ceb21b3-5bd8-30b4-bb18-b222fb7fc748"}], "children": [], "criteria_sets": [], "related_terms": []}
{"name": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "availability": 0, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03.0", "selectable": true, "context": {"system": "fdpg.mii.cds", "code": "Diagnose", "display": "Diagnose", "version": "1.0.0"}, "termcodes": [{"system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "code": "R03.0", "display": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "version": "2024"}], "criteria_sets": ["http://fdpg.mii.cds/CriteriaSet/Diagnose/icd-10-gm"], "display": {"original": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks", "en": "Elevated blood pressure value without diagnosis of hypertension", "de": "Erhöhter Blutdruckwert ohne Diagnose eines Bluthochdrucks"}, "parents": [{"name": "Abnormer Blutdruckwert ohne Diagnose", "contextualized_termcode_hash": "3667a295-d0cb-3e86-8cb3-1b9b050f6e59"}], "children": [], "related_terms": [], "kds_module": "Diagnose"}
{"index": {"_index": "ontology", "_id": "e48709d5-56dd-36e0-9da5-813aa9cbdaea"}}
{"display": {"original": "Unspezifischer niedriger Blutdruckwert", "en-US": "Unspezifischer niedriger Blutdruckwert", "de-DE": "Unspezifischer niedriger Blutdruckwert"}, "availability": 7922, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03.1", "selectable": true, "context": {"code": "Diagnose", "display": "Diagnose", "system": "fdpg.mii.cds", "version": "1.0.0"}, "termcodes": [{"code": "R03.1", "display": "Unspezifischer niedriger Blutdruckwert", "system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "version": "2024"}], "parents": [{"name": "Abnormer Blutdruckwert ohne Diagnose", "contextualized_termcode_hash": "3ceb21b3-5bd8-30b4-bb18-b222fb7fc748"}], "children": [], "criteria_sets": ["http://i.just.made.that.up/for/demo/purposes"], "related_terms": []}
{"name": "Unspezifischer niedriger Blutdruckwert", "availability": 0, "terminology": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "termcode": "R03.1", "selectable": true, "context": {"system": "fdpg.mii.cds", "code": "Diagnose", "display": "Diagnose", "version": "1.0.0"}, "termcodes": [{"system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm", "code": "R03.1", "display": "Unspezifischer niedriger Blutdruckwert", "version": "2024"}], "criteria_sets": ["http://fdpg.mii.cds/CriteriaSet/Diagnose/icd-10-gm"], "display": {"original": "Unspezifischer niedriger Blutdruckwert", "en": "Non-specific low blood pressure value", "de": "Unspezifischer niedriger Blutdruckwert"}, "parents": [{"name": "Abnormer Blutdruckwert ohne Diagnose", "contextualized_termcode_hash": "3667a295-d0cb-3e86-8cb3-1b9b050f6e59"}], "children": [], "related_terms": [], "kds_module": "Diagnose"}

0 comments on commit cf33c97

Please sign in to comment.