From 1311da16368301e6153d07f620055eaee9a3314c Mon Sep 17 00:00:00 2001 From: cfischer Date: Mon, 9 Dec 2024 09:02:21 +0100 Subject: [PATCH] added observationCategory in FHIRProperties --- .../ume/obdstofhir/FhirProperties.java | 1 + .../mii/LymphknotenuntersuchungMapper.java | 3 +- src/main/resources/application.yml | 1 + .../LymphknotenuntersuchungMapperTest.java | 3 +- ...stpatient_1.xml.index_0.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_1.approved.fhir.json | 35 +++++++++++++++++++ ...tpatient_1.xml.index_10.approved.fhir.json | 35 +++++++++++++++++++ ...tpatient_1.xml.index_11.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_2.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_3.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_4.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_5.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_6.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_7.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_8.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_9.approved.fhir.json | 35 +++++++++++++++++++ ...stpatient_1.xml.index_0.approved.fhir.json | 2 +- ...stpatient_1.xml.index_1.approved.fhir.json | 2 +- ...tpatient_1.xml.index_10.approved.fhir.json | 2 +- ...tpatient_1.xml.index_11.approved.fhir.json | 2 +- ...stpatient_1.xml.index_2.approved.fhir.json | 2 +- ...stpatient_1.xml.index_3.approved.fhir.json | 2 +- ...stpatient_1.xml.index_4.approved.fhir.json | 2 +- ...stpatient_1.xml.index_5.approved.fhir.json | 2 +- ...stpatient_1.xml.index_6.approved.fhir.json | 2 +- ...stpatient_1.xml.index_7.approved.fhir.json | 2 +- ...stpatient_1.xml.index_8.approved.fhir.json | 2 +- ...stpatient_1.xml.index_9.approved.fhir.json | 2 +- 28 files changed, 436 insertions(+), 16 deletions(-) create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_0.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_1.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_10.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_11.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_2.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_3.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_4.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_5.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_6.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_7.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_8.approved.fhir.json create mode 100644 src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_9.approved.fhir.json diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java b/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java index cb0265ac..cbe29f8b 100644 --- a/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java +++ b/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java @@ -86,6 +86,7 @@ public static class FhirSystems { private String atcBfarm; private String atcWho; private String observationHistologieId; + private String observationCategory; } @Data diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapper.java index 560daa53..eca26119 100644 --- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapper.java +++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapper.java @@ -112,8 +112,7 @@ public List map( // Category var laboratory = new CodeableConcept( - new Coding( - fhirProperties.getSystems().getObservationCategorySystem(), "laboratory", "")); + new Coding(fhirProperties.getSystems().getObservationCategory(), "laboratory", "")); List list = new ArrayList<>(); list.add(laboratory); obs_befallen.setCategory(list); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc61b2a6..e8bff255 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -74,6 +74,7 @@ fhir: mii-cs-therapie-grund-ende: "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-therapie-grund-ende" atcBfarm: "http://fhir.de/CodeSystem/bfarm/atc" atcWho: "http://www.whocc.no/atc" + observationCategory: "http://terminology.hl7.org/CodeSystem/observation-category" profiles: histologie: "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Histologie" grading: "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Grading" diff --git a/src/test/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.java b/src/test/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.java index 4ead1c7c..ec12c277 100644 --- a/src/test/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.java +++ b/src/test/java/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.java @@ -32,8 +32,7 @@ static void beforeAll(@Autowired FhirProperties fhirProps) { @ParameterizedTest @CsvSource({"Testpatient_1.xml", "Testpatient_2.xml", "Testpatient_3.xml"}) - void map_withGivenObds_shouldCreateValidObservation(String sourceFile) - throws IOException { + void map_withGivenObds_shouldCreateValidObservation(String sourceFile) throws IOException { final var resource = this.getClass().getClassLoader().getResource("obds3/" + sourceFile); assertThat(resource).isNotNull(); diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_0.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_0.approved.fhir.json new file mode 100644 index 00000000..500a04ca --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_0.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "521_befallen" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21893-3" + }, { + "system": "http://snomed.info/sct", + "code": "443527007" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 2, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_1.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_1.approved.fhir.json new file mode 100644 index 00000000..5acb8780 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_1.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "521_untersucht" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21894-1" + }, { + "system": "http://snomed.info/sct", + "code": "444025001" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 10, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_10.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_10.approved.fhir.json new file mode 100644 index 00000000..b824c579 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_10.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "523_befallen_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "92832-5" + }, { + "system": "http://snomed.info/sct", + "code": "1264491009" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2021-06-01", + "valueQuantity": { + "value": 1, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_11.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_11.approved.fhir.json new file mode 100644 index 00000000..1df28599 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_11.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "523_untersucht_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "85347-3" + }, { + "system": "http://snomed.info/sct", + "code": "444411008" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2021-06-01", + "valueQuantity": { + "value": 1, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_2.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_2.approved.fhir.json new file mode 100644 index 00000000..68309f38 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_2.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "521_befallen_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "92832-5" + }, { + "system": "http://snomed.info/sct", + "code": "1264491009" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 1, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_3.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_3.approved.fhir.json new file mode 100644 index 00000000..5e0d8ee8 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_3.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "521_untersucht_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "85347-3" + }, { + "system": "http://snomed.info/sct", + "code": "444411008" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 2, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_4.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_4.approved.fhir.json new file mode 100644 index 00000000..6d1256f1 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_4.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "522_befallen" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21893-3" + }, { + "system": "http://snomed.info/sct", + "code": "443527007" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 2, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_5.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_5.approved.fhir.json new file mode 100644 index 00000000..d5f38e2a --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_5.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "522_untersucht" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21894-1" + }, { + "system": "http://snomed.info/sct", + "code": "444025001" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 10, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_6.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_6.approved.fhir.json new file mode 100644 index 00000000..311985b5 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_6.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "522_befallen_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "92832-5" + }, { + "system": "http://snomed.info/sct", + "code": "1264491009" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 1, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_7.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_7.approved.fhir.json new file mode 100644 index 00000000..08049097 --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_7.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "522_untersucht_sentinel" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "85347-3" + }, { + "system": "http://snomed.info/sct", + "code": "444411008" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2020-03-05", + "valueQuantity": { + "value": 2, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_8.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_8.approved.fhir.json new file mode 100644 index 00000000..3201520e --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_8.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-befallene-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "523_befallen" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21893-3" + }, { + "system": "http://snomed.info/sct", + "code": "443527007" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2021-06-01", + "valueQuantity": { + "value": 5, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_9.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_9.approved.fhir.json new file mode 100644 index 00000000..d5cd054e --- /dev/null +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.index_9.approved.fhir.json @@ -0,0 +1,35 @@ +{ + "resourceType": "Observation", + "meta": { + "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-anzahl-untersuchte-lymphknoten" ] + }, + "identifier": [ { + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/observation-histologie-id", + "value": "523_untersucht" + } ], + "status": "final", + "category": [ { + "coding": [ { + "system": "http://hl7.org/fhir/observation-category", + "code": "laboratory" + } ] + } ], + "code": { + "coding": [ { + "system": "http://loinc.org", + "code": "21894-1" + }, { + "system": "http://snomed.info/sct", + "code": "444025001" + } ] + }, + "subject": { + "reference": "Patient/any" + }, + "effectiveDateTime": "2021-06-01", + "valueQuantity": { + "value": 5, + "system": "http://unitsofmeasure.org", + "code": "1" + } +} \ No newline at end of file diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_0.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_0.approved.fhir.json index 197a67ca..8f8b3485 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_0.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_0.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_1.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_1.approved.fhir.json index 9d2c95c8..459e3c04 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_1.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_1.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_10.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_10.approved.fhir.json index ddfc089d..2612727f 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_10.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_10.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_11.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_11.approved.fhir.json index d268af2c..36736177 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_11.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_11.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_2.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_2.approved.fhir.json index 2c37d251..a954f79d 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_2.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_2.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_3.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_3.approved.fhir.json index 8603ae9b..a7f6b109 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_3.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_3.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_4.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_4.approved.fhir.json index 7873a0a4..8dce3d16 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_4.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_4.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_5.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_5.approved.fhir.json index e66a6f15..447f05f9 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_5.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_5.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_6.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_6.approved.fhir.json index 9aaab6a9..735ef877 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_6.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_6.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_7.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_7.approved.fhir.json index b14fe7cd..8dbff35c 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_7.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_7.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_8.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_8.approved.fhir.json index 50c74b2d..7b3de3bf 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_8.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_8.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ], diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_9.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_9.approved.fhir.json index 1e6dca32..0475d254 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_9.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/LymphknotenuntersuchungMapperTest.map_withGivenObds_shouldCreateValidObservation.Testpatient_1.xml.index_9.approved.fhir.json @@ -10,7 +10,7 @@ "status": "final", "category": [ { "coding": [ { - "system": "http://hl7.org/fhir/observation-category", + "system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory" } ] } ],