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 d9dc4ac0..023cd23e 100644 --- a/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java +++ b/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java @@ -76,6 +76,7 @@ public static class FhirSystems { private String miiCsOnkoStrahlentherapieZielgebiet; private String strahlentherapieProcedureId; private String systemischeTherapieProcedureId; + private String systemischeTherapieMedicationStatementId; private String miiCsOnkoSystemischeTherapieArt; private String miiCsOnkoSeitenlokalisation; private String miiCsTherapieGrundEnde; diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapper.java index c9901ac2..a5950d03 100644 --- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapper.java +++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapper.java @@ -75,7 +75,8 @@ public Bundle map(SYSTTyp syst, Reference patient, Reference procedure) { // if not we may instead need to construct the ID from the patient-id + others. var identifier = new Identifier() - .setSystem(fhirProperties.getSystems().getSystemischeTherapieProcedureId()) + .setSystem( + fhirProperties.getSystems().getSystemischeTherapieMedicationStatementId()) .setValue(String.format("%s_%s", syst.getSYSTID(), substanzId)); systMedicationStatement.addIdentifier(identifier); systMedicationStatement.setId(computeResourceIdFromIdentifier(identifier)); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ee6ffd9c..f0ce33b6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -30,6 +30,7 @@ fhir: psaObservationId: "${fhir.default.baseSystemUrl}/obds-to-fhir/identifiers/psa-observation-id" strahlentherapie-procedure-id: "${fhir.default.baseSystemUrl}/obds-to-fhir/identifiers/strahlentherapie-procedure-id" systemische-therapie-procedure-id: "${fhir.default.baseSystemUrl}/obds-to-fhir/identifiers/systemische-therapie-procedure-id" + systemische-therapie-medication-statement-id: "${fhir.default.baseSystemUrl}/obds-to-fhir/identifiers/systemische-therapie-medication-statement-id" loinc: "http://loinc.org" icdo3Morphologie: "http://terminology.hl7.org/CodeSystem/icd-o-3" icdo3MorphologieOid: "urn:oid:2.16.840.1.113883.6.43.1" diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.approved.fhir.json index 42f73feb..432b740b 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_1.xml.approved.fhir.json @@ -2,15 +2,15 @@ "resourceType": "Bundle", "type": "transaction", "entry": [ { - "fullUrl": "MedicationStatement/99635bf8744dadda1f8b293046f2bfb3d021938263616e6228523113af2695c1", + "fullUrl": "MedicationStatement/050a031e5a9043c28c565c6b60550c3d34cd059bc2f24c195cdb807f099cd978", "resource": { "resourceType": "MedicationStatement", - "id": "99635bf8744dadda1f8b293046f2bfb3d021938263616e6228523113af2695c1", + "id": "050a031e5a9043c28c565c6b60550c3d34cd059bc2f24c195cdb807f099cd978", "meta": { "profile": [ "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/MedicationStatement" ] }, "identifier": [ { - "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-procedure-id", + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-medication-statement-id", "value": "101_IN-1_L01FF05" } ], "partOf": [ { @@ -33,7 +33,7 @@ }, "request": { "method": "PUT", - "url": "MedicationStatement/99635bf8744dadda1f8b293046f2bfb3d021938263616e6228523113af2695c1" + "url": "MedicationStatement/050a031e5a9043c28c565c6b60550c3d34cd059bc2f24c195cdb807f099cd978" } } ] } diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_2.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_2.xml.approved.fhir.json index 33da4a46..6c8f7289 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_2.xml.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_2.xml.approved.fhir.json @@ -2,15 +2,15 @@ "resourceType": "Bundle", "type": "transaction", "entry": [ { - "fullUrl": "MedicationStatement/2be692115f7383b050211e2c4b857655192448b28772b0a5af15839b1a84fa5e", + "fullUrl": "MedicationStatement/e4b35c4756c9668e9c2b92f281667382020c401482e0a674566a695cd20a4cfa", "resource": { "resourceType": "MedicationStatement", - "id": "2be692115f7383b050211e2c4b857655192448b28772b0a5af15839b1a84fa5e", + "id": "e4b35c4756c9668e9c2b92f281667382020c401482e0a674566a695cd20a4cfa", "meta": { "profile": [ "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/MedicationStatement" ] }, "identifier": [ { - "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-procedure-id", + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-medication-statement-id", "value": "11_1_Innere.1_Bicalutamid_fa96" } ], "partOf": [ { @@ -29,7 +29,7 @@ }, "request": { "method": "PUT", - "url": "MedicationStatement/2be692115f7383b050211e2c4b857655192448b28772b0a5af15839b1a84fa5e" + "url": "MedicationStatement/e4b35c4756c9668e9c2b92f281667382020c401482e0a674566a695cd20a4cfa" } } ] } diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_3.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_3.xml.approved.fhir.json index f266efc3..e5a45a30 100644 --- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_3.xml.approved.fhir.json +++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMedicationStatementMapperTest.map_withGivenObds_shouldCreateValidMedicationStatement.Testpatient_3.xml.approved.fhir.json @@ -2,15 +2,15 @@ "resourceType": "Bundle", "type": "transaction", "entry": [ { - "fullUrl": "MedicationStatement/69e986083bed8b3ee0519fda269bfa44104d421348ccd8214f1af901b26650df", + "fullUrl": "MedicationStatement/da9d78a5d066bba6acd32a9a903c8663ecc1421cb373dcb51566b6d23dd30df7", "resource": { "resourceType": "MedicationStatement", - "id": "69e986083bed8b3ee0519fda269bfa44104d421348ccd8214f1af901b26650df", + "id": "da9d78a5d066bba6acd32a9a903c8663ecc1421cb373dcb51566b6d23dd30df7", "meta": { "profile": [ "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/MedicationStatement" ] }, "identifier": [ { - "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-procedure-id", + "system": "https://bzkf.github.io/obds-to-fhir/identifiers/systemische-therapie-medication-statement-id", "value": "12_1_Innere.1_Paclitaxel_a0a4" } ], "partOf": [ { @@ -29,7 +29,7 @@ }, "request": { "method": "PUT", - "url": "MedicationStatement/69e986083bed8b3ee0519fda269bfa44104d421348ccd8214f1af901b26650df" + "url": "MedicationStatement/da9d78a5d066bba6acd32a9a903c8663ecc1421cb373dcb51566b6d23dd30df7" } } ] }