diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/AusgeschlosseneDiagnoseConverter.java b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/AusgeschlosseneDiagnoseConverter.java index 4c687b44f..8281cf296 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/AusgeschlosseneDiagnoseConverter.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/AusgeschlosseneDiagnoseConverter.java @@ -11,11 +11,11 @@ public class AusgeschlosseneDiagnoseConverter extends EntryEntityConverter parseFHIRCoding(Coding coding){ + if(coding.hasDisplay() && coding.hasSystem() && coding.hasCode() && coding.getSystem().equals(CodeSystem.SNOMED.getUrl())){ + return Optional.of(new DvCodedText(coding.getDisplay(), new CodePhrase(new TerminologyId("SNOMED Clinical Terms", ""), coding.getCode()))); + }else if (coding.hasCode() && coding.getSystem().equals(CodeSystem.SNOMED.getUrl())){ + return Optional.of(new DvCodedText("", new CodePhrase(new TerminologyId("SNOMED Clinical Terms", ""), coding.getCode()))); + }else{ + return Optional.empty(); + } + } +} diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GECCODiagnoseCompositionConverter.java b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GECCODiagnoseCompositionConverter.java index 44a829fe9..70d54c655 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GECCODiagnoseCompositionConverter.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GECCODiagnoseCompositionConverter.java @@ -33,7 +33,7 @@ public GECCODiagnoseComposition convertInternal(@NonNull Condition resource) { private void mapCategoryCoding(Condition resource, GECCODiagnoseComposition composition) { Coding categoryCoding = resource.getCategory().get(0).getCoding().get(0); if (categoryCoding.getSystem().equals(CodeSystem.SNOMED.getUrl()) && GeccoDiagnoseCodeDefiningCodeMaps.getKategorieMap().containsKey(categoryCoding.getCode())) { - composition.setKategorieDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getKategorieMap().get(categoryCoding.getCode())); + composition.setKategorie(DvCodedTextParser.parseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getKategorieMap().get(categoryCoding.getCode()))); } else { throw new UnprocessableEntityException("Category has either no or an unsupported SNOMED code"); } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GeccoDiagnoseCodeDefiningCodeMaps.java b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GeccoDiagnoseCodeDefiningCodeMaps.java index f5ee57a58..e9b5975fd 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GeccoDiagnoseCodeDefiningCodeMaps.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/GeccoDiagnoseCodeDefiningCodeMaps.java @@ -2,7 +2,6 @@ import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.KategorieDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.NameDerKoerperstelleDefiningCode; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.NameDesProblemsDerDiagnoseDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.ProblemDiagnoseDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.SchweregradDefiningCode; @@ -13,7 +12,6 @@ class GeccoDiagnoseCodeDefiningCodeMaps { private static final Map kategorieMap = new HashMap<>(); private static final Map problemDiagnoseMap = new HashMap<>(); - private static final Map nameDesProblemDiagnoseMap = new HashMap<>(); private static final Map koerperstelleMap = new HashMap<>(); private static final Map schweregradMap = new HashMap<>(); @@ -26,10 +24,6 @@ class GeccoDiagnoseCodeDefiningCodeMaps { problemDiagnoseMap.put(problem.getCode(), problem); } - for (NameDesProblemsDerDiagnoseDefiningCode problem : NameDesProblemsDerDiagnoseDefiningCode.values()) { - nameDesProblemDiagnoseMap.put(problem.getCode(), problem); - } - for (NameDerKoerperstelleDefiningCode koerperstelleDefiningCode : NameDerKoerperstelleDefiningCode.values()) { koerperstelleMap.put(koerperstelleDefiningCode.getCode(), koerperstelleDefiningCode); } @@ -47,10 +41,6 @@ static Map getProblemDiagnoseMap() { return problemDiagnoseMap; } - static Map getNameDesProblemDiagnoseMap() { - return nameDesProblemDiagnoseMap; - } - static Map getKoerperstelleMap() { return koerperstelleMap; } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/UnbekannteDiagnoseEvaluationConverter.java b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/UnbekannteDiagnoseEvaluationConverter.java index 20b3a51c1..9c101d2a2 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/UnbekannteDiagnoseEvaluationConverter.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/UnbekannteDiagnoseEvaluationConverter.java @@ -12,7 +12,7 @@ public class UnbekannteDiagnoseEvaluationConverter extends EntryEntityConverter< @Override protected UnbekannteDiagnoseEvaluation convertInternal(Condition condition) { UnbekannteDiagnoseEvaluation unbekannteDiagnose = new UnbekannteDiagnoseEvaluation(); - unbekannteDiagnose.setAussageUeberDieFehlendeInformationDefiningCode(AussageUeberDieFehlendeInformationDefiningCode.UNKNOWN_QUALIFIER_VALUE); + unbekannteDiagnose.setAussageUeberDieFehlendeInformation(DvCodedTextParser.parseDefiningCode(AussageUeberDieFehlendeInformationDefiningCode.UNKNOWN_QUALIFIER_VALUE)); mapProblem(condition, unbekannteDiagnose); return unbekannteDiagnose; @@ -22,7 +22,7 @@ private void mapProblem(Condition condition, UnbekannteDiagnoseEvaluation unbeka for(Coding coding : condition.getCode().getCoding()){ if (coding.getSystem().equals(CodeSystem.SNOMED.getUrl()) && GeccoDiagnoseCodeDefiningCodeMaps.getProblemDiagnoseMap().containsKey(coding.getCode())) { - unbekannteDiagnose.setUnbekannteDiagnoseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getProblemDiagnoseMap().get(coding.getCode())); + unbekannteDiagnose.setUnbekannteDiagnose(DvCodedTextParser.parseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getProblemDiagnoseMap().get(coding.getCode()))); } } } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/VorliegendeDiagnoseEvaluationConverter.java b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/VorliegendeDiagnoseEvaluationConverter.java index 9afc1edbd..ff6bcd99c 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/VorliegendeDiagnoseEvaluationConverter.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/converter/specific/geccodiagnose/VorliegendeDiagnoseEvaluationConverter.java @@ -6,6 +6,8 @@ import org.ehrbase.fhirbridge.ehr.converter.specific.CodeSystem; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.KoerperstelleCluster; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseEvaluation; +import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice; +import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText; import org.hl7.fhir.r4.model.Annotation; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.Condition; @@ -61,7 +63,7 @@ private void mapSeverity(Condition condition, VorliegendeDiagnoseEvaluation vorl private void convertSevertiy(Coding coding, VorliegendeDiagnoseEvaluation vorliegendeDiagnose) { if (coding.getSystem().equals(CodeSystem.SNOMED.getUrl()) && GeccoDiagnoseCodeDefiningCodeMaps.getSchweregradMap().containsKey(coding.getCode())) { - vorliegendeDiagnose.setSchweregradDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getSchweregradMap().get(coding.getCode())); + vorliegendeDiagnose.setSchweregrad(DvCodedTextParser.parseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getSchweregradMap().get(coding.getCode()))); isEmpty = false; } else { throw new UnprocessableEntityException("Severity contains either a wrong code or code system."); @@ -73,7 +75,7 @@ private void mapBodySite(Condition condition, VorliegendeDiagnoseEvaluation vorl for (Coding bodySite : condition.getBodySite().get(0).getCoding()) { if (bodySite.getSystem().equals(CodeSystem.SNOMED.getUrl()) && GeccoDiagnoseCodeDefiningCodeMaps.getKoerperstelleMap().containsKey(bodySite.getCode())) { KoerperstelleCluster korperstelleCluster = new KoerperstelleCluster(); - korperstelleCluster.setNameDerKoerperstelleDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getKoerperstelleMap().get(bodySite.getCode())); + korperstelleCluster.setNameDerKoerperstelle(DvCodedTextParser.parseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getKoerperstelleMap().get(bodySite.getCode()))); addKoerperstelleCluster(korperstelleCluster, vorliegendeDiagnose); isEmpty = false; } else { @@ -94,10 +96,13 @@ private void addKoerperstelleCluster(KoerperstelleCluster korperstelleCluster, V private void mapNameDesProblemsDerDiagnose(Condition condition, VorliegendeDiagnoseEvaluation vorliegendeDiagnose) { for (Coding coding : condition.getCode().getCoding()) { - if (coding.getSystem().equals(CodeSystem.SNOMED.getUrl()) && - GeccoDiagnoseCodeDefiningCodeMaps.getNameDesProblemDiagnoseMap().containsKey(coding.getCode())) { - vorliegendeDiagnose.setNameDesProblemsDerDiagnoseDefiningCode(GeccoDiagnoseCodeDefiningCodeMaps.getNameDesProblemDiagnoseMap().get(coding.getCode())); - isEmpty = false; + if (coding.getSystem().equals(CodeSystem.SNOMED.getUrl())) { + if(DvCodedTextParser.parseFHIRCoding(coding).isPresent()){ + VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText vorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText = new VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText(); + vorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText.setNameDesProblemsDerDiagnose(DvCodedTextParser.parseFHIRCoding(coding).get()); + vorliegendeDiagnose.setNameDesProblemsDerDiagnose(vorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText); + isEmpty = false; + } } } } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseComposition.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseComposition.java index 8c8f7246c..5316f3cdc 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseComposition.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseComposition.java @@ -2,9 +2,14 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.Participation; import com.nedap.archie.rm.generic.PartyIdentified; import com.nedap.archie.rm.generic.PartyProxy; +import java.lang.String; +import java.time.temporal.TemporalAccessor; +import java.util.List; +import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Id; @@ -18,306 +23,301 @@ import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.client.openehrclient.VersionUid; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.AusgeschlosseneDiagnoseEvaluation; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.KategorieDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.StatusDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.UnbekannteDiagnoseEvaluation; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseEvaluation; -import javax.annotation.processing.Generated; -import java.time.temporal.TemporalAccessor; -import java.util.List; - @Entity @Archetype("openEHR-EHR-COMPOSITION.registereintrag.v1") @Generated( - value = "org.ehrbase.client.classgenerator.ClassGenerator", - date = "2021-03-09T11:53:07.573814+01:00", - comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.3.0" + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2021-07-12T18:58:20.518470+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" ) @Template("GECCO_Diagnose") public class GECCODiagnoseComposition implements CompositionEntity { - /** - * Path: GECCO_Diagnose/category - */ - @Path("/category|defining_code") - private Category categoryDefiningCode; - - /** - * Path: GECCO_Diagnose/context/Erweiterung - * Description: Ergänzende Angaben zum Registereintrag. - */ - @Path("/context/other_context[at0001]/items[at0002]") - private List erweiterung; - - /** - * Path: GECCO_Diagnose/context/Status - * Description: Status der gelieferten Daten für den Registereintrag. Hinweis: Dies ist nicht der Status einzelner Komponenten. - */ - @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") - private StatusDefiningCode statusDefiningCode; - - /** - * Path: GECCO_Diagnose/context/Baum/Status/null_flavour - */ - @Path("/context/other_context[at0001]/items[at0004]/null_flavour|defining_code") - private NullFlavour statusNullFlavourDefiningCode; - - /** - * Path: GECCO_Diagnose/context/Kategorie - * Description: Die Klassifikation des Registereintrags (z.B. Typ der Observation des FHIR-Profils). - */ - @Path("/context/other_context[at0001]/items[at0005]/value|defining_code") - private KategorieDefiningCode kategorieDefiningCode; - - /** - * Path: GECCO_Diagnose/context/Baum/Kategorie/null_flavour - */ - @Path("/context/other_context[at0001]/items[at0005]/null_flavour|defining_code") - private NullFlavour kategorieNullFlavourDefiningCode; - - /** - * Path: GECCO_Diagnose/context/start_time - */ - @Path("/context/start_time|value") - private TemporalAccessor startTimeValue; - - /** - * Path: GECCO_Diagnose/context/participations - */ - @Path("/context/participations") - private List participations; - - /** - * Path: GECCO_Diagnose/context/end_time - */ - @Path("/context/end_time|value") - private TemporalAccessor endTimeValue; - - /** - * Path: GECCO_Diagnose/context/location - */ - @Path("/context/location") - private String location; - - /** - * Path: GECCO_Diagnose/context/health_care_facility - */ - @Path("/context/health_care_facility") - private PartyIdentified healthCareFacility; - - /** - * Path: GECCO_Diagnose/context/setting - */ - @Path("/context/setting|defining_code") - private Setting settingDefiningCode; - - /** - * Path: GECCO_Diagnose/Vorliegende Diagnose - * Description: Angaben über einen einzelnen identifizierten Gesundheitszustand, eine Verletzung, eine Behinderung oder ein Problem, welches das körperliche, geistige und/oder soziale Wohlergehen einer Einzelperson beeinträchtigt. - * Comment: Eine klare Abgrenzung zwischen Problem und Diagnose ist in der Praxis nicht einfach zu erreichen. Für die Zwecke der klinischen Dokumentation mit diesem Archetyp werden Problem und Diagnose als ein Kontinuum betrachtet, mit zunehmendem Detaillierungsgrad und unterstützenden Beweisen, die in der Regel dem Etikett "Diagnose" Gewicht verleihen. - */ - @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1 and name/value='Vorliegende Diagnose']") - private VorliegendeDiagnoseEvaluation vorliegendeDiagnose; - - /** - * Path: GECCO_Diagnose/Ausgeschlossene Diagnose - * Description: Ein Bericht über den Ausschluss eines/r Problems/Diagnose, familiäre Krankengeschichte, Medikation, Nebenwirkung/Allergens oder eines anderen klinischen Ereignisses, welche/s zur Zeit nicht oder noch nie vorhanden war. - */ - @Path("/content[openEHR-EHR-EVALUATION.exclusion_specific.v1 and name/value='Ausgeschlossene Diagnose']") - private AusgeschlosseneDiagnoseEvaluation ausgeschlosseneDiagnose; - - /** - * Path: GECCO_Diagnose/Unbekannte Diagnose - * Description: Aussage darüber, dass bestimmte Gesundheitsinformationen zum Zeitpukt der Erfassung nicht in der Krankenakte oder einem Schriftstück erfasst werden können, da keine Kenntnisse darüber vorhanden sind. - */ - @Path("/content[openEHR-EHR-EVALUATION.absence.v2 and name/value='Unbekannte Diagnose']") - private UnbekannteDiagnoseEvaluation unbekannteDiagnose; - - /** - * Path: GECCO_Diagnose/composer - */ - @Path("/composer") - private PartyProxy composer; - - /** - * Path: GECCO_Diagnose/language - */ - @Path("/language") - private Language language; - - /** - * Path: GECCO_Diagnose/feeder_audit - */ - @Path("/feeder_audit") - private FeederAudit feederAudit; - - /** - * Path: GECCO_Diagnose/territory - */ - @Path("/territory") - private Territory territory; - - @Id - private VersionUid versionUid; - - public Category getCategoryDefiningCode() { - return this.categoryDefiningCode; - } - - public void setCategoryDefiningCode(Category categoryDefiningCode) { - this.categoryDefiningCode = categoryDefiningCode; - } - - public List getErweiterung() { - return this.erweiterung; - } - - public void setErweiterung(List erweiterung) { - this.erweiterung = erweiterung; - } - - public StatusDefiningCode getStatusDefiningCode() { - return this.statusDefiningCode; - } - - public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { - this.statusDefiningCode = statusDefiningCode; - } - - public NullFlavour getStatusNullFlavourDefiningCode() { - return this.statusNullFlavourDefiningCode; - } - - public void setStatusNullFlavourDefiningCode(NullFlavour statusNullFlavourDefiningCode) { - this.statusNullFlavourDefiningCode = statusNullFlavourDefiningCode; - } - - public KategorieDefiningCode getKategorieDefiningCode() { - return this.kategorieDefiningCode; - } - - public void setKategorieDefiningCode(KategorieDefiningCode kategorieDefiningCode) { - this.kategorieDefiningCode = kategorieDefiningCode; - } - - public NullFlavour getKategorieNullFlavourDefiningCode() { - return this.kategorieNullFlavourDefiningCode; - } - - public void setKategorieNullFlavourDefiningCode(NullFlavour kategorieNullFlavourDefiningCode) { - this.kategorieNullFlavourDefiningCode = kategorieNullFlavourDefiningCode; - } - - public TemporalAccessor getStartTimeValue() { - return this.startTimeValue; - } - - public void setStartTimeValue(TemporalAccessor startTimeValue) { - this.startTimeValue = startTimeValue; - } - - public List getParticipations() { - return this.participations; - } - - public void setParticipations(List participations) { - this.participations = participations; - } - - public TemporalAccessor getEndTimeValue() { - return this.endTimeValue; - } - - public void setEndTimeValue(TemporalAccessor endTimeValue) { - this.endTimeValue = endTimeValue; - } - - public String getLocation() { - return this.location; - } - - public void setLocation(String location) { - this.location = location; - } - - public PartyIdentified getHealthCareFacility() { - return this.healthCareFacility; - } - - public void setHealthCareFacility(PartyIdentified healthCareFacility) { - this.healthCareFacility = healthCareFacility; - } - - public Setting getSettingDefiningCode() { - return this.settingDefiningCode; - } - - public void setSettingDefiningCode(Setting settingDefiningCode) { - this.settingDefiningCode = settingDefiningCode; - } - - public VorliegendeDiagnoseEvaluation getVorliegendeDiagnose() { - return this.vorliegendeDiagnose; - } + /** + * Path: GECCO_Diagnose/category + */ + @Path("/category|defining_code") + private Category categoryDefiningCode; + + /** + * Path: GECCO_Diagnose/context/Erweiterung + * Description: Ergänzende Angaben zum Registereintrag. + */ + @Path("/context/other_context[at0001]/items[at0002]") + private List erweiterung; + + /** + * Path: GECCO_Diagnose/context/Status + * Description: Status der gelieferten Daten für den Registereintrag. Hinweis: Dies ist nicht der Status einzelner Komponenten. + */ + @Path("/context/other_context[at0001]/items[at0004]/value|defining_code") + private StatusDefiningCode statusDefiningCode; + + /** + * Path: GECCO_Diagnose/context/Baum/Status/null_flavour + */ + @Path("/context/other_context[at0001]/items[at0004]/null_flavour|defining_code") + private NullFlavour statusNullFlavourDefiningCode; + + /** + * Path: GECCO_Diagnose/context/Kategorie + * Description: Die Klassifikation des Registereintrags (z.B. Typ der Observation des FHIR-Profils). + */ + @Path("/context/other_context[at0001]/items[at0005]/value") + private DvCodedText kategorie; + + /** + * Path: GECCO_Diagnose/context/Baum/Kategorie/null_flavour + */ + @Path("/context/other_context[at0001]/items[at0005]/null_flavour|defining_code") + private NullFlavour kategorieNullFlavourDefiningCode; + + /** + * Path: GECCO_Diagnose/context/start_time + */ + @Path("/context/start_time|value") + private TemporalAccessor startTimeValue; + + /** + * Path: GECCO_Diagnose/context/participations + */ + @Path("/context/participations") + private List participations; + + /** + * Path: GECCO_Diagnose/context/end_time + */ + @Path("/context/end_time|value") + private TemporalAccessor endTimeValue; + + /** + * Path: GECCO_Diagnose/context/location + */ + @Path("/context/location") + private String location; + + /** + * Path: GECCO_Diagnose/context/health_care_facility + */ + @Path("/context/health_care_facility") + private PartyIdentified healthCareFacility; + + /** + * Path: GECCO_Diagnose/context/setting + */ + @Path("/context/setting|defining_code") + private Setting settingDefiningCode; + + /** + * Path: GECCO_Diagnose/Vorliegende Diagnose + * Description: Angaben über einen einzelnen identifizierten Gesundheitszustand, eine Verletzung, eine Behinderung oder ein Problem, welches das körperliche, geistige und/oder soziale Wohlergehen einer Einzelperson beeinträchtigt. + * Comment: Eine klare Abgrenzung zwischen Problem und Diagnose ist in der Praxis nicht einfach zu erreichen. Für die Zwecke der klinischen Dokumentation mit diesem Archetyp werden Problem und Diagnose als ein Kontinuum betrachtet, mit zunehmendem Detaillierungsgrad und unterstützenden Beweisen, die in der Regel dem Etikett "Diagnose" Gewicht verleihen. + */ + @Path("/content[openEHR-EHR-EVALUATION.problem_diagnosis.v1 and name/value='Vorliegende Diagnose']") + private VorliegendeDiagnoseEvaluation vorliegendeDiagnose; + + /** + * Path: GECCO_Diagnose/Ausgeschlossene Diagnose + * Description: Ein Bericht über den Ausschluss eines/r Problems/Diagnose, familiäre Krankengeschichte, Medikation, Nebenwirkung/Allergens oder eines anderen klinischen Ereignisses, welche/s zur Zeit nicht oder noch nie vorhanden war. + */ + @Path("/content[openEHR-EHR-EVALUATION.exclusion_specific.v1 and name/value='Ausgeschlossene Diagnose']") + private AusgeschlosseneDiagnoseEvaluation ausgeschlosseneDiagnose; + + /** + * Path: GECCO_Diagnose/Unbekannte Diagnose + * Description: Aussage darüber, dass bestimmte Gesundheitsinformationen zum Zeitpukt der Erfassung nicht in der Krankenakte oder einem Schriftstück erfasst werden können, da keine Kenntnisse darüber vorhanden sind. + */ + @Path("/content[openEHR-EHR-EVALUATION.absence.v2 and name/value='Unbekannte Diagnose']") + private UnbekannteDiagnoseEvaluation unbekannteDiagnose; + + /** + * Path: GECCO_Diagnose/composer + */ + @Path("/composer") + private PartyProxy composer; + + /** + * Path: GECCO_Diagnose/language + */ + @Path("/language") + private Language language; + + /** + * Path: GECCO_Diagnose/feeder_audit + */ + @Path("/feeder_audit") + private FeederAudit feederAudit; + + /** + * Path: GECCO_Diagnose/territory + */ + @Path("/territory") + private Territory territory; + + @Id + private VersionUid versionUid; + + public void setCategoryDefiningCode(Category categoryDefiningCode) { + this.categoryDefiningCode = categoryDefiningCode; + } + + public Category getCategoryDefiningCode() { + return this.categoryDefiningCode ; + } + + public void setErweiterung(List erweiterung) { + this.erweiterung = erweiterung; + } + + public List getErweiterung() { + return this.erweiterung ; + } + + public void setStatusDefiningCode(StatusDefiningCode statusDefiningCode) { + this.statusDefiningCode = statusDefiningCode; + } + + public StatusDefiningCode getStatusDefiningCode() { + return this.statusDefiningCode ; + } + + public void setStatusNullFlavourDefiningCode(NullFlavour statusNullFlavourDefiningCode) { + this.statusNullFlavourDefiningCode = statusNullFlavourDefiningCode; + } + + public NullFlavour getStatusNullFlavourDefiningCode() { + return this.statusNullFlavourDefiningCode ; + } + + public void setKategorie(DvCodedText kategorie) { + this.kategorie = kategorie; + } + + public DvCodedText getKategorie() { + return this.kategorie ; + } + + public void setKategorieNullFlavourDefiningCode(NullFlavour kategorieNullFlavourDefiningCode) { + this.kategorieNullFlavourDefiningCode = kategorieNullFlavourDefiningCode; + } + + public NullFlavour getKategorieNullFlavourDefiningCode() { + return this.kategorieNullFlavourDefiningCode ; + } + + public void setStartTimeValue(TemporalAccessor startTimeValue) { + this.startTimeValue = startTimeValue; + } + + public TemporalAccessor getStartTimeValue() { + return this.startTimeValue ; + } + + public void setParticipations(List participations) { + this.participations = participations; + } + + public List getParticipations() { + return this.participations ; + } + + public void setEndTimeValue(TemporalAccessor endTimeValue) { + this.endTimeValue = endTimeValue; + } + + public TemporalAccessor getEndTimeValue() { + return this.endTimeValue ; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getLocation() { + return this.location ; + } + + public void setHealthCareFacility(PartyIdentified healthCareFacility) { + this.healthCareFacility = healthCareFacility; + } + + public PartyIdentified getHealthCareFacility() { + return this.healthCareFacility ; + } + + public void setSettingDefiningCode(Setting settingDefiningCode) { + this.settingDefiningCode = settingDefiningCode; + } + + public Setting getSettingDefiningCode() { + return this.settingDefiningCode ; + } - public void setVorliegendeDiagnose(VorliegendeDiagnoseEvaluation vorliegendeDiagnose) { - this.vorliegendeDiagnose = vorliegendeDiagnose; - } + public void setVorliegendeDiagnose(VorliegendeDiagnoseEvaluation vorliegendeDiagnose) { + this.vorliegendeDiagnose = vorliegendeDiagnose; + } - public AusgeschlosseneDiagnoseEvaluation getAusgeschlosseneDiagnose() { - return this.ausgeschlosseneDiagnose; - } + public VorliegendeDiagnoseEvaluation getVorliegendeDiagnose() { + return this.vorliegendeDiagnose ; + } - public void setAusgeschlosseneDiagnose( - AusgeschlosseneDiagnoseEvaluation ausgeschlosseneDiagnose) { - this.ausgeschlosseneDiagnose = ausgeschlosseneDiagnose; - } - - public UnbekannteDiagnoseEvaluation getUnbekannteDiagnose() { - return this.unbekannteDiagnose; - } - - public void setUnbekannteDiagnose(UnbekannteDiagnoseEvaluation unbekannteDiagnose) { - this.unbekannteDiagnose = unbekannteDiagnose; - } - - public PartyProxy getComposer() { - return this.composer; - } - - public void setComposer(PartyProxy composer) { - this.composer = composer; - } - - public Language getLanguage() { - return this.language; - } - - public void setLanguage(Language language) { - this.language = language; - } - - public FeederAudit getFeederAudit() { - return this.feederAudit; - } - - public void setFeederAudit(FeederAudit feederAudit) { - this.feederAudit = feederAudit; - } - - public Territory getTerritory() { - return this.territory; - } - - public void setTerritory(Territory territory) { - this.territory = territory; - } - - public VersionUid getVersionUid() { - return this.versionUid; - } - - public void setVersionUid(VersionUid versionUid) { - this.versionUid = versionUid; - } + public void setAusgeschlosseneDiagnose( + AusgeschlosseneDiagnoseEvaluation ausgeschlosseneDiagnose) { + this.ausgeschlosseneDiagnose = ausgeschlosseneDiagnose; + } + + public AusgeschlosseneDiagnoseEvaluation getAusgeschlosseneDiagnose() { + return this.ausgeschlosseneDiagnose ; + } + + public void setUnbekannteDiagnose(UnbekannteDiagnoseEvaluation unbekannteDiagnose) { + this.unbekannteDiagnose = unbekannteDiagnose; + } + + public UnbekannteDiagnoseEvaluation getUnbekannteDiagnose() { + return this.unbekannteDiagnose ; + } + + public void setComposer(PartyProxy composer) { + this.composer = composer; + } + + public PartyProxy getComposer() { + return this.composer ; + } + + public void setLanguage(Language language) { + this.language = language; + } + + public Language getLanguage() { + return this.language ; + } + + public void setFeederAudit(FeederAudit feederAudit) { + this.feederAudit = feederAudit; + } + + public FeederAudit getFeederAudit() { + return this.feederAudit ; + } + + public void setTerritory(Territory territory) { + this.territory = territory; + } + + public Territory getTerritory() { + return this.territory ; + } + + public VersionUid getVersionUid() { + return this.versionUid ; + } + + public void setVersionUid(VersionUid versionUid) { + this.versionUid = versionUid; + } } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseCompositionContainment.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseCompositionContainment.java index 6b73d5ec4..a5eb0ef0b 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseCompositionContainment.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/GECCODiagnoseCompositionContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.Participation; import com.nedap.archie.rm.generic.PartyIdentified; import com.nedap.archie.rm.generic.PartyProxy; @@ -18,7 +19,6 @@ import org.ehrbase.client.classgenerator.shareddefinition.Setting; import org.ehrbase.client.classgenerator.shareddefinition.Territory; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.AusgeschlosseneDiagnoseEvaluation; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.KategorieDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.StatusDefiningCode; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.UnbekannteDiagnoseEvaluation; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseEvaluation; @@ -34,7 +34,7 @@ public class GECCODiagnoseCompositionContainment extends Containment { public SelectAqlField STATUS_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(GECCODiagnoseComposition.class, "/context/other_context[at0001]/items[at0004]/null_flavour|defining_code", "statusNullFlavourDefiningCode", NullFlavour.class, this); - public SelectAqlField KATEGORIE_DEFINING_CODE = new AqlFieldImp(GECCODiagnoseComposition.class, "/context/other_context[at0001]/items[at0005]/value|defining_code", "kategorieDefiningCode", KategorieDefiningCode.class, this); + public SelectAqlField KATEGORIE = new AqlFieldImp(GECCODiagnoseComposition.class, "/context/other_context[at0001]/items[at0005]/value", "kategorie", DvCodedText.class, this); public SelectAqlField KATEGORIE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(GECCODiagnoseComposition.class, "/context/other_context[at0001]/items[at0005]/null_flavour|defining_code", "kategorieNullFlavourDefiningCode", NullFlavour.class, this); diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluation.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluation.java index 66aa6bddd..b90caf87f 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluation.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluation.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.util.List; import javax.annotation.processing.Generated; @@ -16,17 +17,17 @@ @Archetype("openEHR-EHR-EVALUATION.exclusion_specific.v1") @Generated( value = "org.ehrbase.client.classgenerator.ClassGenerator", - date = "2021-03-09T11:53:07.648300+01:00", - comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.3.0" + date = "2021-07-12T18:58:20.606446+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" ) public class AusgeschlosseneDiagnoseEvaluation implements EntryEntity { /** * Path: GECCO_Diagnose/Ausgeschlossene Diagnose/Aussage über den Ausschluss * Description: Ein Bericht über den Ausschluss eines/r bestimmten Problems/Diagnose, familiäre Krankengeschichte, Medikation, Verfahren, Nebenwirkung oder eines anderen klinischen Ereignisses. - * Comment: Diese Beschreibung muss in Verbindung mit dem Datenelement "ausgeschlossene Kategorie" verwendet werden. Zum Beispiel: Dieses Datenelement kann zur Erfassung einer allgemeinen Aussage, wie z.B. "keine bekannte Vorgeschichte über..." verwendet werden. Die "ausgeschlossene Kategorie" spezifiziert die Aussage, in dem eine Zuordnung zu z.B. Diagnose oder Medikation vorgenommen werden kann. Wird bereits die "ausgeschlossene Kategorie" dafür genutzt, durch eine präkoordinierte Bezeichnung das Vorliegen von Diabetes in der familiären Krankengeschichte auszuschließen, ist der Eintrag in diesem Datenelement redundant. + * Comment: Diese Beschreibung muss in Verbindung mit dem Datenelement "ausgeschlossene Kategorie" verwendet werden. Zum Beispiel: Dieses Datenelement kann zur Erfassung einer allgemeinen Aussage, wie z.B. "keine bekannte Vorgeschichte über..." verwendet werden. Die "ausgeschlossene Kategorie" spezifiziert die Aussage, in dem eine Zuordnung zu z.B. Diagnose oder Medikation vorgenommen werden kann. Wird bereits die "ausgeschlossene Kategorie" dafür genutzt, durch eine präkoordinierte Bezeichnung das Vorliegen von Diabetes in der familiären Krankengeschichte auszuschließen, ist der Eintrag in diesem Datenelement redundant. */ - @Path("/data[at0001]/items[at0002]/value|defining_code") - private AussageUeberDenAusschlussDefiningCode aussageUeberDenAusschlussDefiningCode; + @Path("/data[at0001]/items[at0002]/value") + private DvCodedText aussageUeberDenAusschluss; /** * Path: GECCO_Diagnose/Ausgeschlossene Diagnose/Tree/Aussage über den Ausschluss/null_flavour @@ -36,19 +37,10 @@ public class AusgeschlosseneDiagnoseEvaluation implements EntryEntity { /** * Path: GECCO_Diagnose/Ausgeschlossene Diagnose/Problem/Diagnose - * Description: Benennung der Kategorie, des ausgeschlossenen Sachverhalts. - * Comment: Dieses Item kann unterschiedlich genutzt werden. Zum Beispiel: "Familiäre Vorgeschichte Diabetes": - * - * (1) Einschränkung des Namens der "ausgeschlossenen Kategorie" zur Laufzeit über einen "Name constraint" (in diesem Fall "familiäre Probleme/Diagnosen") und Speicherung von "Diabetes" als Wert dieses Datenelements. - * oder - * (2) Belegung des Wertes mit Hilfe von präkoordinierten Benennungen, z.B. "keine familiäre Diabetes-Vorgeschichte". - * - * Die Kodierung des Datenelements "ausgeschlossene Kategorie", z.B. durch präkoordinierte Benennungen oder Terminologien, ist wünschenswert. - * - * Wird das Datenelement wie in Beispiel (2) kodiert, ist eine weitere Spezifikation im Feld "Aussage über den Ausschluss" nicht notwendig. + * Description: Das Problem oder die Diagnose, auf die sich die Ausschlussaussage bezieht. Zum Beispiel: "Diabetes", "COPD" oder "Asthma". */ - @Path("/data[at0001]/items[at0003 and name/value='Problem/Diagnose']/value|defining_code") - private ProblemDiagnoseDefiningCode problemDiagnoseDefiningCode; + @Path("/data[at0001]/items[at0003 and name/value='Problem/Diagnose']/value") + private DvCodedText problemDiagnose; /** * Path: GECCO_Diagnose/Ausgeschlossene Diagnose/Tree/Problem/Diagnose/null_flavour @@ -82,13 +74,12 @@ public class AusgeschlosseneDiagnoseEvaluation implements EntryEntity { @Path("/feeder_audit") private FeederAudit feederAudit; - public void setAussageUeberDenAusschlussDefiningCode( - AussageUeberDenAusschlussDefiningCode aussageUeberDenAusschlussDefiningCode) { - this.aussageUeberDenAusschlussDefiningCode = aussageUeberDenAusschlussDefiningCode; + public void setAussageUeberDenAusschluss(DvCodedText aussageUeberDenAusschluss) { + this.aussageUeberDenAusschluss = aussageUeberDenAusschluss; } - public AussageUeberDenAusschlussDefiningCode getAussageUeberDenAusschlussDefiningCode() { - return this.aussageUeberDenAusschlussDefiningCode ; + public DvCodedText getAussageUeberDenAusschluss() { + return this.aussageUeberDenAusschluss ; } public void setAussageUeberDenAusschlussNullFlavourDefiningCode( @@ -100,13 +91,12 @@ public NullFlavour getAussageUeberDenAusschlussNullFlavourDefiningCode() { return this.aussageUeberDenAusschlussNullFlavourDefiningCode ; } - public void setProblemDiagnoseDefiningCode( - ProblemDiagnoseDefiningCode problemDiagnoseDefiningCode) { - this.problemDiagnoseDefiningCode = problemDiagnoseDefiningCode; + public void setProblemDiagnose(DvCodedText problemDiagnose) { + this.problemDiagnose = problemDiagnose; } - public ProblemDiagnoseDefiningCode getProblemDiagnoseDefiningCode() { - return this.problemDiagnoseDefiningCode ; + public DvCodedText getProblemDiagnose() { + return this.problemDiagnose ; } public void setProblemDiagnoseNullFlavourDefiningCode( diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluationContainment.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluationContainment.java index 4af9db26a..f0346dbbe 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluationContainment.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AusgeschlosseneDiagnoseEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -14,11 +15,11 @@ public class AusgeschlosseneDiagnoseEvaluationContainment extends Containment { public SelectAqlField AUSGESCHLOSSENE_DIAGNOSE_EVALUATION = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "", "AusgeschlosseneDiagnoseEvaluation", AusgeschlosseneDiagnoseEvaluation.class, this); - public SelectAqlField AUSSAGE_UEBER_DEN_AUSSCHLUSS_DEFINING_CODE = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "aussageUeberDenAusschlussDefiningCode", AussageUeberDenAusschlussDefiningCode.class, this); + public SelectAqlField AUSSAGE_UEBER_DEN_AUSSCHLUSS = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value", "aussageUeberDenAusschluss", DvCodedText.class, this); public SelectAqlField AUSSAGE_UEBER_DEN_AUSSCHLUSS_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/null_flavour|defining_code", "aussageUeberDenAusschlussNullFlavourDefiningCode", NullFlavour.class, this); - public SelectAqlField PROBLEM_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/value|defining_code", "problemDiagnoseDefiningCode", ProblemDiagnoseDefiningCode.class, this); + public SelectAqlField PROBLEM_DIAGNOSE = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/value", "problemDiagnose", DvCodedText.class, this); public SelectAqlField PROBLEM_DIAGNOSE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(AusgeschlosseneDiagnoseEvaluation.class, "/data[at0001]/items[at0003]/null_flavour|defining_code", "problemDiagnoseNullFlavourDefiningCode", NullFlavour.class, this); diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDenAusschlussDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDenAusschlussDefiningCode.java index 695d798d8..5d23824d5 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDenAusschlussDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDenAusschlussDefiningCode.java @@ -4,37 +4,37 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum AussageUeberDenAusschlussDefiningCode implements EnumValueSet { - KNOWN_ABSENT_QUALIFIER_VALUE("Known absent (qualifier value)", "", "SNOMED Clinical Terms", "410594000"); + KNOWN_ABSENT_QUALIFIER_VALUE("Known absent (qualifier value)", "", "SNOMED Clinical Terms", "410594000"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - AussageUeberDenAusschlussDefiningCode(String value, String description, String terminologyId, - String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + AussageUeberDenAusschlussDefiningCode(String value, String description, String terminologyId, + String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDieFehlendeInformationDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDieFehlendeInformationDefiningCode.java index e1a214bd0..93482e16b 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDieFehlendeInformationDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/AussageUeberDieFehlendeInformationDefiningCode.java @@ -4,37 +4,37 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum AussageUeberDieFehlendeInformationDefiningCode implements EnumValueSet { - UNKNOWN_QUALIFIER_VALUE("Unknown (qualifier value)", "", "SNOMED Clinical Terms", "Unknown (qualifier value)"); + UNKNOWN_QUALIFIER_VALUE("Unknown (qualifier value)", "", "SNOMED Clinical Terms", "Unknown (qualifier value)"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - AussageUeberDieFehlendeInformationDefiningCode(String value, String description, - String terminologyId, String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + AussageUeberDieFehlendeInformationDefiningCode(String value, String description, + String terminologyId, String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KategorieDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KategorieDefiningCode.java index 13f19675b..19e6e5d16 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KategorieDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KategorieDefiningCode.java @@ -4,64 +4,64 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum KategorieDefiningCode implements EnumValueSet { - PULMONARYMEDICINE("pulmonaryMedicine", "", "SNOMED Clinical Terms", "418112009"), + PULMONARYMEDICINE("pulmonaryMedicine", "", "SNOMED Clinical Terms", "418112009"), - TRANSPLANT_MEDICINE("Transplant medicine", "", "SNOMED Clinical Terms", "788415003"), + TRANSPLANT_MEDICINE("Transplant medicine", "", "SNOMED Clinical Terms", "788415003"), - PSYCHIATRY("Psychiatry", "", "SNOMED Clinical Terms", "394587001"), + PSYCHIATRY("Psychiatry", "", "SNOMED Clinical Terms", "394587001"), - RHEUMATOLOTY("rheumatoloty", "", "SNOMED Clinical Terms", "394810000"), + RHEUMATOLOTY("rheumatoloty", "", "SNOMED Clinical Terms", "394810000"), - DIABETIC_MEDICINE("Diabetic Medicine", "", "SNOMED Clinical Terms", "408475000"), + DIABETIC_MEDICINE("Diabetic Medicine", "", "SNOMED Clinical Terms", "408475000"), - INFECTIOUSDISEASES("infectiousDiseases", "", "SNOMED Clinical Terms", "394807007"), + INFECTIOUSDISEASES("infectiousDiseases", "", "SNOMED Clinical Terms", "394807007"), - IMMUNOLOGY("immunology", "", "SNOMED Clinical Terms", "408480009"), + IMMUNOLOGY("immunology", "", "SNOMED Clinical Terms", "408480009"), - NEUROLOGY("Neurology", "", "SNOMED Clinical Terms", "394591006"), + NEUROLOGY("Neurology", "", "SNOMED Clinical Terms", "394591006"), - VASCULARMEDICINE("vascularMedicine", "", "SNOMED Clinical Terms", "722414000"), + VASCULARMEDICINE("vascularMedicine", "", "SNOMED Clinical Terms", "722414000"), - NEPHROLOGY_QUALIFIER_VALUE("Nephrology (qualifier value)", "", "SNOMED Clinical Terms", "394589003"), + NEPHROLOGY_QUALIFIER_VALUE("Nephrology (qualifier value)", "", "SNOMED Clinical Terms", "394589003"), - COMPLICATION_DISORDER("Complication (disorder)", "", "SNOMED Clinical Terms", "116223007"), + COMPLICATION_DISORDER("Complication (disorder)", "", "SNOMED Clinical Terms", "116223007"), - HEPATOLOGY("hepatology", "", "SNOMED Clinical Terms", "408472002"), + HEPATOLOGY("hepatology", "", "SNOMED Clinical Terms", "408472002"), - ONCOLOGY("Oncology", "", "SNOMED Clinical Terms", "394593009"), + ONCOLOGY("Oncology", "", "SNOMED Clinical Terms", "394593009"), - GASTROENTEROLOGY("Gastroenterology", "", "SNOMED Clinical Terms", "394584008"), + GASTROENTEROLOGY("Gastroenterology", "", "SNOMED Clinical Terms", "394584008"), - VENTILATION_STATUS_OBSERVABLE_ENTITY("Ventilation status (observable entity)", "", "SNOMED Clinical Terms", "404989005"); + VENTILATION_STATUS_OBSERVABLE_ENTITY("Ventilation status (observable entity)", "", "SNOMED Clinical Terms", "404989005"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - KategorieDefiningCode(String value, String description, String terminologyId, String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + KategorieDefiningCode(String value, String description, String terminologyId, String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleCluster.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleCluster.java index 89a8416ef..cc7e49475 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleCluster.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleCluster.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import java.util.List; import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; @@ -14,8 +15,8 @@ @Archetype("openEHR-EHR-CLUSTER.anatomical_location.v1") @Generated( value = "org.ehrbase.client.classgenerator.ClassGenerator", - date = "2021-03-09T11:53:07.627942+01:00", - comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.3.0" + date = "2021-07-12T18:58:20.563258+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" ) public class KoerperstelleCluster implements LocatableEntity { /** @@ -27,8 +28,8 @@ public class KoerperstelleCluster implements LocatableEntity { * * Wenn der Name der Körperstelle bereits im übergeordneten Archetyp angegeben ist, kann dieses Datenelement redundant sein. Alternativ wurde ein Anwendungsfall ermittelt, bei dem der Wert in dieses Element dupliziert sein könnte, um semantische Abfragen unter Verwendung dieses Archetyps und nicht das Datenelement innerhalb des übergeordneten Elements zu unterstützen. */ - @Path("/items[at0001]/value|defining_code") - private NameDerKoerperstelleDefiningCode nameDerKoerperstelleDefiningCode; + @Path("/items[at0001]/value") + private DvCodedText nameDerKoerperstelle; /** * Path: GECCO_Diagnose/Vorliegende Diagnose/Structure/Körperstelle/Name der Körperstelle/null_flavour @@ -71,13 +72,12 @@ public class KoerperstelleCluster implements LocatableEntity { @Path("/feeder_audit") private FeederAudit feederAudit; - public void setNameDerKoerperstelleDefiningCode( - NameDerKoerperstelleDefiningCode nameDerKoerperstelleDefiningCode) { - this.nameDerKoerperstelleDefiningCode = nameDerKoerperstelleDefiningCode; + public void setNameDerKoerperstelle(DvCodedText nameDerKoerperstelle) { + this.nameDerKoerperstelle = nameDerKoerperstelle; } - public NameDerKoerperstelleDefiningCode getNameDerKoerperstelleDefiningCode() { - return this.nameDerKoerperstelleDefiningCode ; + public DvCodedText getNameDerKoerperstelle() { + return this.nameDerKoerperstelle ; } public void setNameDerKoerperstelleNullFlavourDefiningCode( diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleClusterContainment.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleClusterContainment.java index 5c0c5a226..4cd89ea39 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleClusterContainment.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/KoerperstelleClusterContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; import org.ehrbase.client.aql.field.ListAqlFieldImp; @@ -12,7 +13,7 @@ public class KoerperstelleClusterContainment extends Containment { public SelectAqlField KOERPERSTELLE_CLUSTER = new AqlFieldImp(KoerperstelleCluster.class, "", "KoerperstelleCluster", KoerperstelleCluster.class, this); - public SelectAqlField NAME_DER_KOERPERSTELLE_DEFINING_CODE = new AqlFieldImp(KoerperstelleCluster.class, "/items[at0001]/value|defining_code", "nameDerKoerperstelleDefiningCode", NameDerKoerperstelleDefiningCode.class, this); + public SelectAqlField NAME_DER_KOERPERSTELLE = new AqlFieldImp(KoerperstelleCluster.class, "/items[at0001]/value", "nameDerKoerperstelle", DvCodedText.class, this); public SelectAqlField NAME_DER_KOERPERSTELLE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(KoerperstelleCluster.class, "/items[at0001]/null_flavour|defining_code", "nameDerKoerperstelleNullFlavourDefiningCode", NullFlavour.class, this); diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDerKoerperstelleDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDerKoerperstelleDefiningCode.java index bfbf242e4..32ffda2e8 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDerKoerperstelleDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDerKoerperstelleDefiningCode.java @@ -4,67 +4,67 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum NameDerKoerperstelleDefiningCode implements EnumValueSet { - CEREBRAL_MENINGES_STRUCTURE_BODY_STRUCTURE("Cerebral meninges structure (body structure)", "", "SNOMED Clinical Terms", "8935007"), + CEREBRAL_MENINGES_STRUCTURE_BODY_STRUCTURE("Cerebral meninges structure (body structure)", "", "SNOMED Clinical Terms", "8935007"), - BONE_TISSUE_STRUCTURE_BODY_STRUCTURE("Bone (tissue) structure (body structure)", "", "SNOMED Clinical Terms", "3138006"), + BONE_TISSUE_STRUCTURE_BODY_STRUCTURE("Bone (tissue) structure (body structure)", "", "SNOMED Clinical Terms", "3138006"), - ENTIRE_SMALL_INTESTINE_BODY_STRUCTURE("Entire small intestine (body structure)", "", "SNOMED Clinical Terms", "181250005"), + ENTIRE_SMALL_INTESTINE_BODY_STRUCTURE("Entire small intestine (body structure)", "", "SNOMED Clinical Terms", "181250005"), - ENTIRE_LARGE_INTESTINE_BODY_STRUCTURE("Entire large intestine (body structure)", "", "SNOMED Clinical Terms", "181254001"), + ENTIRE_LARGE_INTESTINE_BODY_STRUCTURE("Entire large intestine (body structure)", "", "SNOMED Clinical Terms", "181254001"), - ENTIRE_LUNG_BODY_STRUCTURE("Entire lung (body structure)", "", "SNOMED Clinical Terms", "181216001"), + ENTIRE_LUNG_BODY_STRUCTURE("Entire lung (body structure)", "", "SNOMED Clinical Terms", "181216001"), - ENTIRE_LIVER_BODY_STRUCTURE("Entire liver (body structure)", "", "SNOMED Clinical Terms", "181268008"), + ENTIRE_LIVER_BODY_STRUCTURE("Entire liver (body structure)", "", "SNOMED Clinical Terms", "181268008"), - ENTIRE_PANCREAS_BODY_STRUCTURE("Entire pancreas (body structure)", "", "SNOMED Clinical Terms", "181277001"), + ENTIRE_PANCREAS_BODY_STRUCTURE("Entire pancreas (body structure)", "", "SNOMED Clinical Terms", "181277001"), - TENDON_STRUCTURE_BODY_STRUCTURE("Tendon structure (body structure)", "", "SNOMED Clinical Terms", "13024002"), + TENDON_STRUCTURE_BODY_STRUCTURE("Tendon structure (body structure)", "", "SNOMED Clinical Terms", "13024002"), - ENTIRE_HEART_VALVE_BODY_STRUCTURE("Entire heart valve (body structure)", "", "SNOMED Clinical Terms", "181285005"), + ENTIRE_HEART_VALVE_BODY_STRUCTURE("Entire heart valve (body structure)", "", "SNOMED Clinical Terms", "181285005"), - ENTIRE_CORNEA_BODY_STRUCTURE("Entire cornea (body structure)", "", "SNOMED Clinical Terms", "181162001"), + ENTIRE_CORNEA_BODY_STRUCTURE("Entire cornea (body structure)", "", "SNOMED Clinical Terms", "181162001"), - BLOOD_VESSEL_PART_BODY_STRUCTURE("Blood vessel part (body structure)", "", "SNOMED Clinical Terms", "119206002"), + BLOOD_VESSEL_PART_BODY_STRUCTURE("Blood vessel part (body structure)", "", "SNOMED Clinical Terms", "119206002"), - ENTIRE_KIDNEY_BODY_STRUCTURE("Entire kidney (body structure)", "", "SNOMED Clinical Terms", "181414000"), + ENTIRE_KIDNEY_BODY_STRUCTURE("Entire kidney (body structure)", "", "SNOMED Clinical Terms", "181414000"), - SKIN_PART_BODY_STRUCTURE("Skin part (body structure)", "", "SNOMED Clinical Terms", "119181002"), + SKIN_PART_BODY_STRUCTURE("Skin part (body structure)", "", "SNOMED Clinical Terms", "119181002"), - CARTILAGE_TISSUE_BODY_STRUCTURE("Cartilage tissue (body structure)", "", "SNOMED Clinical Terms", "309312004"), + CARTILAGE_TISSUE_BODY_STRUCTURE("Cartilage tissue (body structure)", "", "SNOMED Clinical Terms", "309312004"), - ENTIRE_HEART_BODY_STRUCTURE("Entire heart (body structure)", "", "SNOMED Clinical Terms", "302509004"), + ENTIRE_HEART_BODY_STRUCTURE("Entire heart (body structure)", "", "SNOMED Clinical Terms", "302509004"), - EAR_OSSICLE_STRUCTURE_BODY_STRUCTURE("Ear ossicle structure (body structure)", "", "SNOMED Clinical Terms", "41845008"); + EAR_OSSICLE_STRUCTURE_BODY_STRUCTURE("Ear ossicle structure (body structure)", "", "SNOMED Clinical Terms", "41845008"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - NameDerKoerperstelleDefiningCode(String value, String description, String terminologyId, - String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + NameDerKoerperstelleDefiningCode(String value, String description, String terminologyId, + String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java deleted file mode 100644 index 7b57ebc7c..000000000 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/NameDesProblemsDerDiagnoseDefiningCode.java +++ /dev/null @@ -1,178 +0,0 @@ -package org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition; - -import java.lang.String; -import org.ehrbase.client.classgenerator.EnumValueSet; - -public enum NameDesProblemsDerDiagnoseDefiningCode implements EnumValueSet { - BONE_TISSUE_STRUCTURE_BODY_STRUCTURE("Bone (tissue) structure (body structure)", "", "SNOMED Clinical Terms", "3138006"), - - DEMENTIA_DISORDER("Dementia (disorder)", "", "SNOMED Clinical Terms", "52448006"), - - CHRONIC_VIRAL_HEPATITIS_DISORDER("Chronic viral hepatitis (disorder)", "", "SNOMED Clinical Terms", "10295004"), - - ENTIRE_SMALL_INTESTINE_BODY_STRUCTURE("Entire small intestine (body structure)", "", "SNOMED Clinical Terms", "181250005"), - - MULTIPLE_SCLEROSIS_DISORDER("Multiple sclerosis (disorder)", "", "SNOMED Clinical Terms", "24700007"), - - MALIGNANT_NEOPLASTIC_DISEASE("Malignant neoplastic disease", "", "SNOMED Clinical Terms", "363346000"), - - PULMONARY_HYPERTENSION_DISORDER("Pulmonary hypertension (disorder)", "", "SNOMED Clinical Terms", "70995007"), - - CIRRHOSIS_OF_LIVER_DISORDER("Cirrhosis of liver (disorder)", "", "SNOMED Clinical Terms", "19943007"), - - FIBROSIS_OF_LUNG_DISORDER_LUNGENFIBROSE("Fibrosis of lung (disorder) Lungenfibrose", "", "SNOMED Clinical Terms", "51615001"), - - OBSTRUCTIVE_SLEEP_APNEA_SYNDROME_DISORDER("Obstructive sleep apnea syndrome (disorder)", "", "SNOMED Clinical Terms", "78275009"), - - DIABETES_MELLITUS_TYPE1_DISORDER("Diabetes mellitus type 1 (disorder)", "", "SNOMED Clinical Terms", "46635009"), - - N_HISTORY_OF_CLINICAL_FINDING_IN_SUBJECT_SITUATION_ASSOCIATED_FINDING_ATTRIBUTE_MYOCARDIAL_INFARCTION_DISORDER_ZUSTAND_NACH_HERZINFARKT("|History of clinical finding in subject (situation)|:|Associated finding (attribute)|=|Myocardial infarction (disorder)| Zustand nach Herzinfarkt", "", "SNOMED Clinical Terms", "417662000:246090004=22298006"), - - EXTREME_OBESITY_WITH_ALVEOLAR_HYPOVENTILATION_DISORDER("Extreme obesity with alveolar hypoventilation (disorder)", "", "SNOMED Clinical Terms", "190966007"), - - DIABETES_MELLITUS_TYPE2_DISORDER("Diabetes mellitus type 2 (disorder)", "", "SNOMED Clinical Terms", "44054006"), - - ASTHMA_DISORDER("Asthma (disorder)", "", "SNOMED Clinical Terms", "195967001"), - - CHRONIC_KIDNEY_DISEASE_STAGE4_DISORDER("Chronic kidney disease stage 4 (disorder)", "", "SNOMED Clinical Terms", "431857002"), - - HYPERTENSIVE_DISORDER_SYSTEMIC_ARTERIAL_DISORDER("Hypertensive disorder, systemic arterial (disorder)", "", "SNOMED Clinical Terms", "38341003"), - - EPILEPSY_DISORDER("Epilepsy (disorder)", "", "SNOMED Clinical Terms", "84757009"), - - HISTORY_OF_CEREBROVASCULAR_ACCIDENT_WITHOUT_RESIDUAL_DEFICITS_SITUATION("History of cerebrovascular accident without residual deficits (situation", "", "SNOMED Clinical Terms", "429993008"), - - CORONARY_ARTERIOSCLEROSIS_DISORDER("Coronary arteriosclerosis (disorder)", "", "SNOMED Clinical Terms", "53741008"), - - ENTIRE_LARGE_INTESTINE_BODY_STRUCTURE("Entire large intestine (body structure)", "", "SNOMED Clinical Terms", "181254001"), - - VASCULITIS_DISORDER("Vasculitis (disorder)", "", "SNOMED Clinical Terms", "31996006"), - - ENTIRE_LUNG_BODY_STRUCTURE("Entire lung (body structure)", "", "SNOMED Clinical Terms", "181216001"), - - PSYCHOTIC_DISORDER_DISORDER("Psychotic disorder (disorder)", "", "SNOMED Clinical Terms", "69322001"), - - CHRONIC_KIDNEY_DISEASE_DISORDER("Chronic kidney disease (disorder)", "", "SNOMED Clinical Terms", "709044004"), - - SECONDARY_DIABETES_MELLITUS_DISORDER("Secondary diabetes mellitus (disorder)", "", "SNOMED Clinical Terms", "8801005"), - - MENTAL_DISORDER_DISORDER("Mental disorder (disorder)", "", "SNOMED Clinical Terms", "74732009"), - - HEART_FAILURE_DISORDER_HERZINSUFFIZIENZ("Heart failure (disorder) Herzinsuffizienz", "", "SNOMED Clinical Terms", "84114007"), - - CHRONIC_KIDNEY_DISEASE_STAGE5_ON_DIALYSIS_DISORDER("Chronic kidney disease stage 5 on dialysis (disorder)", "", "SNOMED Clinical Terms", "714152005"), - - CHRONIC_KIDNEY_DISEASE_STAGE1_DISORDER("Chronic kidney disease stage 1 (disorder)", "", "SNOMED Clinical Terms", "431855005"), - - CYSTIC_FIBROSIS_DISORDER_CYSTISCHE_FIBROSE("Cystic fibrosis (disorder) Cystische Fibrose", "", "SNOMED Clinical Terms", "190905008"), - - CHRONIC_KIDNEY_DISEASE_STAGE2_DISORDER("Chronic kidney disease stage 2 (disorder)", "", "SNOMED Clinical Terms", "431856006"), - - PARKINSON_S_DISEASE_DISORDER("Parkinson's disease (disorder)", "", "SNOMED Clinical Terms", "49049000"), - - ENTIRE_KIDNEY_BODY_STRUCTURE("Entire kidney (body structure)", "", "SNOMED Clinical Terms", "181414000"), - - CHRONIC_KIDNEY_DISEASE_STAGE3_DISORDER("Chronic kidney disease stage 3 (disorder)", "", "SNOMED Clinical Terms", "433144002"), - - SKIN_PART_BODY_STRUCTURE("Skin part (body structure)", "", "SNOMED Clinical Terms", "119181002"), - - PERIPHERAL_ARTERIAL_OCCLUSIVE_DISEASE_DISORDER("Peripheral arterial occlusive disease (disorder)", "", "SNOMED Clinical Terms", "399957001"), - - HISTORY_OF_CEREBROVASCULAR_ACCIDENT_WITH_RESIDUAL_DEFICIT_SITUATION("History of cerebrovascular accident with residual deficit (situation)", "", "SNOMED Clinical Terms", "440140008"), - - MIGRAINE_DISORDER("Migraine (disorder)", "", "SNOMED Clinical Terms", "37796009"), - - INFLAMMATORY_BOWEL_DISEASE_DISORDER("Inflammatory bowel disease (disorder)", "", "SNOMED Clinical Terms", "24526004"), - - CONGENITAL_IMMUNODEFICIENCY_DISEASE_DISORDER("Congenital immunodeficiency disease (disorder)", "", "SNOMED Clinical Terms", "36138009"), - - CHRONIC_KIDNEY_DISEASE_STAGE5_DISORDER("Chronic kidney disease stage 5 (disorder)", "", "SNOMED Clinical Terms", "433146000"), - - CHRONIC_NERVOUS_SYSTEM_DISORDER_DISORDER("Chronic nervous system disorder (disorder)", "", "SNOMED Clinical Terms", "128283000"), - - COMBINED_DISORDER_OF_MUSCLE_AND_PERIPHERAL_NERVE_DISORDER("Combined disorder of muscle AND peripheral nerve (disorder)", "", "SNOMED Clinical Terms", "257277002"), - - CARDIAC_ARRHYTHMIA_DISORDER_HERZRHYTHMUSSTOERUNGEN("Cardiac arrhythmia (disorder) Herzrhythmusstörungen", "", "SNOMED Clinical Terms", "698247007"), - - STEATOSIS_OF_LIVER_DISORDER("Steatosis of liver (disorder)", "", "SNOMED Clinical Terms", "197321007"), - - BLOOD_VESSEL_PART_BODY_STRUCTURE("Blood vessel part (body structure)", "", "SNOMED Clinical Terms", "119206002"), - - GASTROINTESTINAL_ULCER("Gastrointestinal ulcer", "", "SNOMED Clinical Terms", "40845000"), - - HUMAN_IMMUNODEFICIENCY_VIRUS_INFECTION("Human immunodeficiency virus infection", "", "SNOMED Clinical Terms", "86406008"), - - CHRONIC_OBSTRUCTIVE_LUNG_DISEASE_DISORDER("Chronic obstructive lung disease (disorder)", "", "SNOMED Clinical Terms", "13645005"), - - ENTIRE_HEART_BODY_STRUCTURE("Entire heart (body structure)", "", "SNOMED Clinical Terms", "302509004"), - - CEREBRAL_MENINGES_STRUCTURE_BODY_STRUCTURE("Cerebral meninges structure (body structure)", "", "SNOMED Clinical Terms", "8935007"), - - DEPRESSIVE_DISORDER_DISORDER("Depressive disorder (disorder)", "", "SNOMED Clinical Terms", "35489007"), - - AUTOIMMUNE_LIVER_DISEASE_DISORDER("Autoimmune liver disease (disorder)", "", "SNOMED Clinical Terms", "235890007"), - - ENTIRE_LIVER_BODY_STRUCTURE("Entire liver (body structure)", "", "SNOMED Clinical Terms", "181268008"), - - ENTIRE_PANCREAS_BODY_STRUCTURE("Entire pancreas (body structure)", "", "SNOMED Clinical Terms", "181277001"), - - TENDON_STRUCTURE_BODY_STRUCTURE("Tendon structure (body structure)", "", "SNOMED Clinical Terms", "13024002"), - - ANXIETY_DISORDER_DISORDER("Anxiety disorder (disorder)", "", "SNOMED Clinical Terms", "197480006"), - - SLEEP_APNEA_DISORDER("Sleep apnea (disorder)", "", "SNOMED Clinical Terms", "73430006"), - - DISORDER_OF_CONNECTIVE_TISSUE_DISORDER("Disorder of connective tissue (disorder", "", "SNOMED Clinical Terms", "105969002"), - - INTESTINAL_STRUCTURE_BODY_STRUCTURE("Intestinal structure (body structure)", "", "SNOMED Clinical Terms", "113276009"), - - ENTIRE_HEART_VALVE_BODY_STRUCTURE("Entire heart valve (body structure)", "", "SNOMED Clinical Terms", "181285005"), - - INSULIN_TREATED_TYPE2_DIABETES_MELLITUS_DISORDER("Insulin treated type 2 diabetes mellitus (disorder)", "", "SNOMED Clinical Terms", "237599002"), - - CAROTID_ARTERY_STENOSIS_DISORDER("Carotid artery stenosis (disorder)", "", "SNOMED Clinical Terms", "64586002"), - - ENTIRE_CORNEA_BODY_STRUCTURE("Entire cornea (body structure)", "", "SNOMED Clinical Terms", "181162001"), - - RHEUMATOID_ARTHRITIS_DISORDER("Rheumatoid arthritis (disorder)", "", "SNOMED Clinical Terms", "69896004"), - - N_PAST_HISTORY_OF_PROCEDURE_SITUATION_ASSOCIATED_PROCEDURE_ATTRIBUTE_HEART_REVASCULARIZATION_PROCEDURE("|Past history of procedure (situation)|:|Associated procedure (attribute)|=|Heart revascularization (procedure)|", "", "SNOMED Clinical Terms", "416940007:363589002=81266008"), - - CARTILAGE_TISSUE_BODY_STRUCTURE("Cartilage tissue (body structure)", "", "SNOMED Clinical Terms", "309312004"), - - CARDIOVASCULAR_DISEASE("Cardiovascular disease","", "SNOMED Clinical Terms", "49601007"), - - EAR_OSSICLE_STRUCTURE_BODY_STRUCTURE("Ear ossicle structure (body structure)", "", "SNOMED Clinical Terms", "41845008"); - - private String value; - - private String description; - - private String terminologyId; - - private String code; - - NameDesProblemsDerDiagnoseDefiningCode(String value, String description, String terminologyId, - String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } - - public String getValue() { - return this.value ; - } - - public String getDescription() { - return this.description ; - } - - public String getTerminologyId() { - return this.terminologyId ; - } - - public String getCode() { - return this.code ; - } -} diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/ProblemDiagnoseDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/ProblemDiagnoseDefiningCode.java index 52c012375..b1b61d3ec 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/ProblemDiagnoseDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/ProblemDiagnoseDefiningCode.java @@ -4,102 +4,102 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum ProblemDiagnoseDefiningCode implements EnumValueSet { - VORHANDENSEIN_EINES_AORTOKORONAREN_BYPASSES("Vorhandensein eines aortokoronaren Bypasses", "", "ICD", "Z95.1"), + VORHANDENSEIN_EINES_AORTOKORONAREN_BYPASSES("Vorhandensein eines aortokoronaren Bypasses", "", "ICD", "Z95.1"), - HERZINSUFFIZIENZ_NICHT_NAEHER_BEZEICHNET("Herzinsuffizienz, nicht näher bezeichnet", "", "ICD", "I50.9"), + HERZINSUFFIZIENZ_NICHT_NAEHER_BEZEICHNET("Herzinsuffizienz, nicht näher bezeichnet", "", "ICD", "I50.9"), - KARDIALE_ARRHYTHMIE_NICHT_NAEHER_BEZEICHNET("Kardiale Arrhythmie, nicht näher bezeichnet", "", "ICD", "I49.9"), + KARDIALE_ARRHYTHMIE_NICHT_NAEHER_BEZEICHNET("Kardiale Arrhythmie, nicht näher bezeichnet", "", "ICD", "I49.9"), - AKUTES_NIERENVERSAGEN_NICHT_NAEHER_BEZEICHNET("Akutes Nierenversagen, nicht näher bezeichnet", "", "ICD", "N17.9"), + AKUTES_NIERENVERSAGEN_NICHT_NAEHER_BEZEICHNET("Akutes Nierenversagen, nicht näher bezeichnet", "", "ICD", "N17.9"), - VERSCHLUSS_UND_STENOSE_DER_A_CAROTIS("Verschluss und Stenose der A. carotis", "", "ICD", "I65.2"), + VERSCHLUSS_UND_STENOSE_DER_A_CAROTIS("Verschluss und Stenose der A. carotis", "", "ICD", "I65.2"), - PERIPHERE_GEFAESSKRANKHEIT_NICHT_NAEHER_BEZEICHNET("Periphere Gefäßkrankheit, nicht näher bezeichnet", "", "ICD", "I73.9"), + PERIPHERE_GEFAESSKRANKHEIT_NICHT_NAEHER_BEZEICHNET("Periphere Gefäßkrankheit, nicht näher bezeichnet", "", "ICD", "I73.9"), - VORHANDENSEIN_EINES_IMPLANTATES_ODER_TRANSPLANTATES_NACH_KORONARER_GEFAESSPLASTIK("Vorhandensein eines Implantates oder Transplantates nach koronarer Gefäßplastik", "", "ICD", "Z95.5"), + VORHANDENSEIN_EINES_IMPLANTATES_ODER_TRANSPLANTATES_NACH_KORONARER_GEFAESSPLASTIK("Vorhandensein eines Implantates oder Transplantates nach koronarer Gefäßplastik", "", "ICD", "Z95.5"), - ZUSTAND_NACH_KERATOPLASTIK("Zustand nach Keratoplastik", "", "ICD", "Z94.7"), + ZUSTAND_NACH_KERATOPLASTIK("Zustand nach Keratoplastik", "", "ICD", "Z94.7"), - ZUSTAND_NACH_NIERENTRANSPLANTATION("Zustand nach Nierentransplantation", "", "ICD", "Z94.0"), + ZUSTAND_NACH_NIERENTRANSPLANTATION("Zustand nach Nierentransplantation", "", "ICD", "Z94.0"), - ZUSTAND_NACH_HAUTTRANSPLANTATION("Zustand nach Hauttransplantation", "", "ICD", "Z94.5"), + ZUSTAND_NACH_HAUTTRANSPLANTATION("Zustand nach Hauttransplantation", "", "ICD", "Z94.5"), - ZUSTAND_NACH_HAEMATOPOETISCHER_STAMMZELLTRANSPLANTATION_OHNE_GEGENWAERTIGE_IMMUNSUPPRESSION("Zustand nach hämatopoetischer Stammzelltransplantation ohne gegenwärtige Immunsuppression", "", "ICD", "Z94.80"), + ZUSTAND_NACH_HAEMATOPOETISCHER_STAMMZELLTRANSPLANTATION_OHNE_GEGENWAERTIGE_IMMUNSUPPRESSION("Zustand nach hämatopoetischer Stammzelltransplantation ohne gegenwärtige Immunsuppression", "", "ICD", "Z94.80"), - PNEUMONIE_NICHT_NAEHER_BEZEICHNET("Pneumonie, nicht näher bezeichnet", "", "ICD", "J18.9"), + PNEUMONIE_NICHT_NAEHER_BEZEICHNET("Pneumonie, nicht näher bezeichnet", "", "ICD", "J18.9"), - AKUTER_MYOKARDINFARKT_NICHT_NAEHER_BEZEICHNET("Akuter Myokardinfarkt, nicht näher bezeichnet", "", "ICD", "I21.9"), + AKUTER_MYOKARDINFARKT_NICHT_NAEHER_BEZEICHNET("Akuter Myokardinfarkt, nicht näher bezeichnet", "", "ICD", "I21.9"), - ZUSTAND_NACH_KNOCHENTRANSPLANTATION("Zustand nach Knochentransplantation", "", "ICD", "Z94.6"), + ZUSTAND_NACH_KNOCHENTRANSPLANTATION("Zustand nach Knochentransplantation", "", "ICD", "Z94.6"), - ATHEROSKLEROTISCHE_HERZKRANKHEIT("Atherosklerotische Herzkrankheit", "", "ICD", "I25.1"), + ATHEROSKLEROTISCHE_HERZKRANKHEIT("Atherosklerotische Herzkrankheit", "", "ICD", "I25.1"), - ALTER_MYOKARDINFARKT_NICHT_NAEHER_BEZEICHNET("Alter Myokardinfarkt Nicht näher bezeichnet", "", "ICD", "I25.29"), + ALTER_MYOKARDINFARKT_NICHT_NAEHER_BEZEICHNET("Alter Myokardinfarkt Nicht näher bezeichnet", "", "ICD", "I25.29"), - EMBOLIE_UND_THROMBOSE_NICHT_NAEHER_BEZEICHNETER_VENE("Embolie und Thrombose nicht näher bezeichneter Vene", "", "ICD", "I82.9"), + EMBOLIE_UND_THROMBOSE_NICHT_NAEHER_BEZEICHNETER_VENE("Embolie und Thrombose nicht näher bezeichneter Vene", "", "ICD", "I82.9"), - LUNGENEMBOLIE_OHNE_ANGABE_EINES_AKUTEN_COR_PULMONALE("Lungenembolie ohne Angabe eines akuten Cor pulmonale", "", "ICD", "I26.9"), + LUNGENEMBOLIE_OHNE_ANGABE_EINES_AKUTEN_COR_PULMONALE("Lungenembolie ohne Angabe eines akuten Cor pulmonale", "", "ICD", "I26.9"), - INFEKTIOESE_UND_PARASITAERE_KRANKHEITEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Infektiöse und parasitäre Krankheiten infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B20"), + INFEKTIOESE_UND_PARASITAERE_KRANKHEITEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Infektiöse und parasitäre Krankheiten infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B20"), - ESSENTIELLE_HYPERTONIE_NICHT_NAEHER_BEZEICHNET_OHNE_ANGABE_EINER_HYPERTENSIVEN_KRISE("Essentielle Hypertonie, nicht näher bezeichnet : Ohne Angabe einer hypertensiven Krise", "", "ICD", "I10.90"), + ESSENTIELLE_HYPERTONIE_NICHT_NAEHER_BEZEICHNET_OHNE_ANGABE_EINER_HYPERTENSIVEN_KRISE("Essentielle Hypertonie, nicht näher bezeichnet : Ohne Angabe einer hypertensiven Krise", "", "ICD", "I10.90"), - ZUSTAND_NACH_HAEMATOPOETISCHER_STAMMZELLTRANSPLANTATION_MIT_GEGENWAERTIGER_IMMUNSUPPRESSION("Zustand nach hämatopoetischer Stammzelltransplantation mit gegenwärtiger Immunsuppression", "", "ICD", "Z94.81"), + ZUSTAND_NACH_HAEMATOPOETISCHER_STAMMZELLTRANSPLANTATION_MIT_GEGENWAERTIGER_IMMUNSUPPRESSION("Zustand nach hämatopoetischer Stammzelltransplantation mit gegenwärtiger Immunsuppression", "", "ICD", "Z94.81"), - SEPSIS_NICHT_NAEHER_BEZEICHNET("Sepsis, nicht näher bezeichnet", "", "ICD", "A41.9"), + SEPSIS_NICHT_NAEHER_BEZEICHNET("Sepsis, nicht näher bezeichnet", "", "ICD", "A41.9"), - SCHLAGANFALL_NICHT_ALS_BLUTUNG_ODER_INFARKT_BEZEICHNET("Schlaganfall, nicht als Blutung oder Infarkt bezeichnet", "", "ICD", "I64"), + SCHLAGANFALL_NICHT_ALS_BLUTUNG_ODER_INFARKT_BEZEICHNET("Schlaganfall, nicht als Blutung oder Infarkt bezeichnet", "", "ICD", "I64"), - ZUSTAND_NACH_ORGAN_ODER_GEWEBETRANSPLANTATION_NICHT_NAEHER_BEZEICHNET("Zustand nach Organ- oder Gewebetransplantation, nicht näher bezeichnet", "", "ICD", "Z94.9"), + ZUSTAND_NACH_ORGAN_ODER_GEWEBETRANSPLANTATION_NICHT_NAEHER_BEZEICHNET("Zustand nach Organ- oder Gewebetransplantation, nicht näher bezeichnet", "", "ICD", "Z94.9"), - NICHT_NAEHER_BEZEICHNETE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Nicht näher bezeichnete HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B24"), + NICHT_NAEHER_BEZEICHNETE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Nicht näher bezeichnete HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B24"), - ZUSTAND_NACH_HERZTRANSPLANTATION("Zustand nach Herztransplantation", "", "ICD", "Z94.1"), + ZUSTAND_NACH_HERZTRANSPLANTATION("Zustand nach Herztransplantation", "", "ICD", "Z94.1"), - ZUSTAND_NACH_LEBERTRANSPLANTATION("Zustand nach Lebertransplantation", "", "ICD", "Z94.4"), + ZUSTAND_NACH_LEBERTRANSPLANTATION("Zustand nach Lebertransplantation", "", "ICD", "Z94.4"), - VORHANDENSEIN_VON_SONSTIGEN_KARDIALEN_ODER_VASKULAEREN_IMPLANTATEN_ODER_TRANSPLANTATEN("Vorhandensein von sonstigen kardialen oder vaskulären Implantaten oder Transplantaten", "", "ICD", "Z95.88"), + VORHANDENSEIN_VON_SONSTIGEN_KARDIALEN_ODER_VASKULAEREN_IMPLANTATEN_ODER_TRANSPLANTATEN("Vorhandensein von sonstigen kardialen oder vaskulären Implantaten oder Transplantaten", "", "ICD", "Z95.88"), - ZUSTAND_NACH_SONSTIGER_ORGAN_ODER_GEWEBETRANSPLANTATION_INKL_DARM_PANKREAS("Zustand nach sonstiger Organ- oder Gewebetransplantation Inkl.: Darm Pankreas", "", "ICD", "Z94.88"), + ZUSTAND_NACH_SONSTIGER_ORGAN_ODER_GEWEBETRANSPLANTATION_INKL_DARM_PANKREAS("Zustand nach sonstiger Organ- oder Gewebetransplantation Inkl.: Darm Pankreas", "", "ICD", "Z94.88"), - ZUSTAND_NACH_HERZ_LUNGEN_TRANSPLANTATION("Zustand nach Herz-Lungen-Transplantation", "", "ICD", "Z94.3"), + ZUSTAND_NACH_HERZ_LUNGEN_TRANSPLANTATION("Zustand nach Herz-Lungen-Transplantation", "", "ICD", "Z94.3"), - SONSTIGE_NAEHER_BEZEICHNETE_KRANKHEITEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Sonstige näher bezeichnete Krankheiten infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B22"), + SONSTIGE_NAEHER_BEZEICHNETE_KRANKHEITEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Sonstige näher bezeichnete Krankheiten infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B22"), - ULCUS_PEPTICUM_JEJUNI_WEDER_ALS_AKUT_NOCH_ALS_CHRONISCH_BEZEICHNET_OHNE_BLUTUNG_ODER_PERFORATION("Ulcus pepticum jejuni : Weder als akut noch als chronisch bezeichnet, ohne Blutung oder Perforation", "", "ICD", "K28.9"), + ULCUS_PEPTICUM_JEJUNI_WEDER_ALS_AKUT_NOCH_ALS_CHRONISCH_BEZEICHNET_OHNE_BLUTUNG_ODER_PERFORATION("Ulcus pepticum jejuni : Weder als akut noch als chronisch bezeichnet, ohne Blutung oder Perforation", "", "ICD", "K28.9"), - ZUSTAND_NACH_LUNGENTRANSPLANTATION("Zustand nach Lungentransplantation", "", "ICD", "Z94.2"), + ZUSTAND_NACH_LUNGENTRANSPLANTATION("Zustand nach Lungentransplantation", "", "ICD", "Z94.2"), - BOESARTIGE_NEUBILDUNGEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Bösartige Neubildungen infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B21"); + BOESARTIGE_NEUBILDUNGEN_INFOLGE_HIV_KRANKHEIT_HUMANE_IMMUNDEFIZIENZ_VIRUSKRANKHEIT("Bösartige Neubildungen infolge HIV-Krankheit [Humane Immundefizienz-Viruskrankheit]", "", "ICD", "B21"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - ProblemDiagnoseDefiningCode(String value, String description, String terminologyId, String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + ProblemDiagnoseDefiningCode(String value, String description, String terminologyId, String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/SchweregradDefiningCode.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/SchweregradDefiningCode.java index 0fb868c55..96c53e95c 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/SchweregradDefiningCode.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/SchweregradDefiningCode.java @@ -4,58 +4,58 @@ import org.ehrbase.client.classgenerator.EnumValueSet; public enum SchweregradDefiningCode implements EnumValueSet { - FATAL_QUALIFIER_VALUE("Fatal (qualifier value)", "", "SNOMED Clinical Terms", "399166001"), + FATAL_QUALIFIER_VALUE("Fatal (qualifier value)", "", "SNOMED Clinical Terms", "399166001"), - SEVERE_SEVERITY_MODIFIER_QUALIFIER_VALUE("Severe (severity modifier) (qualifier value)", "", "SNOMED Clinical Terms", "24484000"), + SEVERE_SEVERITY_MODIFIER_QUALIFIER_VALUE("Severe (severity modifier) (qualifier value)", "", "SNOMED Clinical Terms", "24484000"), - LIFE_THREATENING_SEVERITY_QUALIFIER_VALUE("Life threatening severity (qualifier value)", "", "SNOMED Clinical Terms", "442452003"), + LIFE_THREATENING_SEVERITY_QUALIFIER_VALUE("Life threatening severity (qualifier value)", "", "SNOMED Clinical Terms", "442452003"), - SCHWER("Schwer", "Das Problem oder die Diagnose verhindert die normale Aktivität oder verursacht schwerwiegende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0049"), + SCHWER("Schwer", "Das Problem oder die Diagnose verhindert die normale Aktivität oder verursacht schwerwiegende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0049"), - MILD_QUALIFIER_VALUE("Mild (qualifier value)", "", "SNOMED Clinical Terms", "255604002"), + MILD_QUALIFIER_VALUE("Mild (qualifier value)", "", "SNOMED Clinical Terms", "255604002"), - UNKNOWN_QUALIFIER_VALUE("Unknown (qualifier value)", "", "SNOMED Clinical Terms", "261665006"), + UNKNOWN_QUALIFIER_VALUE("Unknown (qualifier value)", "", "SNOMED Clinical Terms", "261665006"), - MAESSIG("Mäßig", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität oder verursacht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0048"), + MAESSIG("Mäßig", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität oder verursacht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0048"), - LEICHT("Leicht", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität nicht, bzw. verursacht nicht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0047"), + LEICHT("Leicht", "Das Problem oder die Diagnose beeinträchtigt die normale Aktivität nicht, bzw. verursacht nicht bleibende gesundheitliche Schäden, falls es nicht behandelt wird.", "SNOMED Clinical Terms", "at0047"), - REMISSION_PHASE_QUALIFIER_VALUE("Remission phase (qualifier value)", "", "SNOMED Clinical Terms", "277022003"), + REMISSION_PHASE_QUALIFIER_VALUE("Remission phase (qualifier value)", "", "SNOMED Clinical Terms", "277022003"), - MODERATE_SEVERITY_MODIFIER_QUALIFIER_VALUE("Moderate (severity modifier) (qualifier value)", "", "SNOMED Clinical Terms", "6736007"), + MODERATE_SEVERITY_MODIFIER_QUALIFIER_VALUE("Moderate (severity modifier) (qualifier value)", "", "SNOMED Clinical Terms", "6736007"), - MODERATE_TO_SEVERE_QUALIFIER_VALUE("Moderate to severe (qualifier value)", "", "SNOMED Clinical Terms", "371924009"), + MODERATE_TO_SEVERE_QUALIFIER_VALUE("Moderate to severe (qualifier value)", "", "SNOMED Clinical Terms", "371924009"), - MILD_TO_MODERATE_QUALIFIER_VALUE("Mild to moderate (qualifier value)", "", "SNOMED Clinical Terms", "371923003"); + MILD_TO_MODERATE_QUALIFIER_VALUE("Mild to moderate (qualifier value)", "", "SNOMED Clinical Terms", "371923003"); - private String value; + private String value; - private String description; + private String description; - private String terminologyId; + private String terminologyId; - private String code; + private String code; - SchweregradDefiningCode(String value, String description, String terminologyId, String code) { - this.value = value; - this.description = description; - this.terminologyId = terminologyId; - this.code = code; - } + SchweregradDefiningCode(String value, String description, String terminologyId, String code) { + this.value = value; + this.description = description; + this.terminologyId = terminologyId; + this.code = code; + } - public String getValue() { - return this.value ; - } + public String getValue() { + return this.value ; + } - public String getDescription() { - return this.description ; - } + public String getDescription() { + return this.description ; + } - public String getTerminologyId() { - return this.terminologyId ; - } + public String getTerminologyId() { + return this.terminologyId ; + } - public String getCode() { - return this.code ; - } -} + public String getCode() { + return this.code ; + } +} \ No newline at end of file diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluation.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluation.java index 01d7298af..3b4606d1b 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluation.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluation.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.util.List; import javax.annotation.processing.Generated; @@ -16,8 +17,8 @@ @Archetype("openEHR-EHR-EVALUATION.absence.v2") @Generated( value = "org.ehrbase.client.classgenerator.ClassGenerator", - date = "2021-03-09T11:53:07.660823+01:00", - comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.3.0" + date = "2021-07-12T18:58:20.615124+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" ) public class UnbekannteDiagnoseEvaluation implements EntryEntity { /** @@ -25,8 +26,8 @@ public class UnbekannteDiagnoseEvaluation implements EntryEntity { * Description: Positive Aussage, dass keine Informationen verfügbar sind. * Comment: Zum Beispiel: "Es liegen keine Informationen über Nebenwirkungen vor"; "Es liegen keine Informationen über Probleme oder Diagnosen vor"; "Es liegen keine Informationen über vorangegangene Verfahren vor"; oder "Es liegen keine Informationen über verwendete Medikamente vor". */ - @Path("/data[at0001]/items[at0002 and name/value='Unbekannte Diagnose']/value|defining_code") - private ProblemDiagnoseDefiningCode unbekannteDiagnoseDefiningCode; + @Path("/data[at0001]/items[at0002 and name/value='Unbekannte Diagnose']/value") + private DvCodedText unbekannteDiagnose; /** * Path: GECCO_Diagnose/Unbekannte Diagnose/Baum/Unbekannte Diagnose/null_flavour @@ -39,8 +40,8 @@ public class UnbekannteDiagnoseEvaluation implements EntryEntity { * Description: Beschreibung des Grundes, warum keine Informationen vorhanden sind. * Comment: Zum Beispiel: Der Patient ist bewusstlos oder weigert sich Informationen preiszugeben. Die Codierung mit einer Terminologie wird empfohlen, wenn möglich. */ - @Path("/data[at0001]/items[at0005 and name/value='Aussage über die fehlende Information']/value|defining_code") - private AussageUeberDieFehlendeInformationDefiningCode aussageUeberDieFehlendeInformationDefiningCode; + @Path("/data[at0001]/items[at0005 and name/value='Aussage über die fehlende Information']/value") + private DvCodedText aussageUeberDieFehlendeInformation; /** * Path: GECCO_Diagnose/Unbekannte Diagnose/Baum/Aussage über die fehlende Information/null_flavour @@ -74,13 +75,12 @@ public class UnbekannteDiagnoseEvaluation implements EntryEntity { @Path("/feeder_audit") private FeederAudit feederAudit; - public void setUnbekannteDiagnoseDefiningCode( - ProblemDiagnoseDefiningCode unbekannteDiagnoseDefiningCode) { - this.unbekannteDiagnoseDefiningCode = unbekannteDiagnoseDefiningCode; + public void setUnbekannteDiagnose(DvCodedText unbekannteDiagnose) { + this.unbekannteDiagnose = unbekannteDiagnose; } - public ProblemDiagnoseDefiningCode getUnbekannteDiagnoseDefiningCode() { - return this.unbekannteDiagnoseDefiningCode ; + public DvCodedText getUnbekannteDiagnose() { + return this.unbekannteDiagnose ; } public void setUnbekannteDiagnoseNullFlavourDefiningCode( @@ -92,14 +92,13 @@ public NullFlavour getUnbekannteDiagnoseNullFlavourDefiningCode() { return this.unbekannteDiagnoseNullFlavourDefiningCode ; } - public void setAussageUeberDieFehlendeInformationDefiningCode( - AussageUeberDieFehlendeInformationDefiningCode aussageUeberDieFehlendeInformationDefiningCode) { - this.aussageUeberDieFehlendeInformationDefiningCode = aussageUeberDieFehlendeInformationDefiningCode; + public void setAussageUeberDieFehlendeInformation( + DvCodedText aussageUeberDieFehlendeInformation) { + this.aussageUeberDieFehlendeInformation = aussageUeberDieFehlendeInformation; } - public AussageUeberDieFehlendeInformationDefiningCode getAussageUeberDieFehlendeInformationDefiningCode( - ) { - return this.aussageUeberDieFehlendeInformationDefiningCode ; + public DvCodedText getAussageUeberDieFehlendeInformation() { + return this.aussageUeberDieFehlendeInformation ; } public void setAussageUeberDieFehlendeInformationNullFlavourDefiningCode( diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluationContainment.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluationContainment.java index 38cc15956..275f19fe9 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluationContainment.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/UnbekannteDiagnoseEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import org.ehrbase.client.aql.containment.Containment; import org.ehrbase.client.aql.field.AqlFieldImp; @@ -14,11 +15,11 @@ public class UnbekannteDiagnoseEvaluationContainment extends Containment { public SelectAqlField UNBEKANNTE_DIAGNOSE_EVALUATION = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "", "UnbekannteDiagnoseEvaluation", UnbekannteDiagnoseEvaluation.class, this); - public SelectAqlField UNBEKANNTE_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "unbekannteDiagnoseDefiningCode", ProblemDiagnoseDefiningCode.class, this); + public SelectAqlField UNBEKANNTE_DIAGNOSE = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value", "unbekannteDiagnose", DvCodedText.class, this); public SelectAqlField UNBEKANNTE_DIAGNOSE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/null_flavour|defining_code", "unbekannteDiagnoseNullFlavourDefiningCode", NullFlavour.class, this); - public SelectAqlField AUSSAGE_UEBER_DIE_FEHLENDE_INFORMATION_DEFINING_CODE = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value|defining_code", "aussageUeberDieFehlendeInformationDefiningCode", AussageUeberDieFehlendeInformationDefiningCode.class, this); + public SelectAqlField AUSSAGE_UEBER_DIE_FEHLENDE_INFORMATION = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "aussageUeberDieFehlendeInformation", DvCodedText.class, this); public SelectAqlField AUSSAGE_UEBER_DIE_FEHLENDE_INFORMATION_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(UnbekannteDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/null_flavour|defining_code", "aussageUeberDieFehlendeInformationNullFlavourDefiningCode", NullFlavour.class, this); diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluation.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluation.java index cdee22d2c..c608b11ea 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluation.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluation.java @@ -2,12 +2,14 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; import java.util.List; import javax.annotation.processing.Generated; import org.ehrbase.client.annotations.Archetype; +import org.ehrbase.client.annotations.Choice; import org.ehrbase.client.annotations.Entity; import org.ehrbase.client.annotations.Path; import org.ehrbase.client.classgenerator.interfaces.EntryEntity; @@ -18,18 +20,10 @@ @Archetype("openEHR-EHR-EVALUATION.problem_diagnosis.v1") @Generated( value = "org.ehrbase.client.classgenerator.ClassGenerator", - date = "2021-03-09T11:53:07.616265+01:00", - comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.3.0" + date = "2021-07-12T18:58:20.557483+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" ) public class VorliegendeDiagnoseEvaluation implements EntryEntity { - /** - * Path: GECCO_Diagnose/Vorliegende Diagnose/Name des Problems/ der Diagnose - * Description: Namentliche Identifikation des Problems oder der Diagnose. - * Comment: Wo möglich, ist die Kodierung des Problems oder der Diagnose über eine Terminologie zu bevorzugen. - */ - @Path("/data[at0001]/items[at0002]/value|defining_code") - private NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode; - /** * Path: GECCO_Diagnose/Vorliegende Diagnose/Structure/Name des Problems/ der Diagnose/null_flavour */ @@ -62,8 +56,8 @@ public class VorliegendeDiagnoseEvaluation implements EntryEntity { * Description: Eine Gesamtbeurteilung des Schweregrades des Problems oder der Diagnose. * Comment: Ist der Schweregrad über vordefinierte Codes im Element "Name des Problems/ der Diagnose" enthalten, wird dieses Datenelement überflüssig. Hinweis: Eine spezifischere Einstufung des Schweregrads kann mit Hilfe des SLOTs "Spezifische Angaben" angegeben werden. */ - @Path("/data[at0001]/items[at0005]/value|defining_code") - private SchweregradDefiningCode schweregradDefiningCode; + @Path("/data[at0001]/items[at0005]/value") + private DvCodedText schweregrad; /** * Path: GECCO_Diagnose/Vorliegende Diagnose/Structure/Schweregrad/null_flavour @@ -140,14 +134,13 @@ public class VorliegendeDiagnoseEvaluation implements EntryEntity { @Path("/feeder_audit") private FeederAudit feederAudit; - public void setNameDesProblemsDerDiagnoseDefiningCode( - NameDesProblemsDerDiagnoseDefiningCode nameDesProblemsDerDiagnoseDefiningCode) { - this.nameDesProblemsDerDiagnoseDefiningCode = nameDesProblemsDerDiagnoseDefiningCode; - } - - public NameDesProblemsDerDiagnoseDefiningCode getNameDesProblemsDerDiagnoseDefiningCode() { - return this.nameDesProblemsDerDiagnoseDefiningCode ; - } + /** + * Path: GECCO_Diagnose/Vorliegende Diagnose/Name des Problems/ der Diagnose + * Description: Namentliche Identifikation des Problems oder der Diagnose. + */ + @Path("/data[at0001]/items[at0002]/value") + @Choice + private VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice nameDesProblemsDerDiagnose; public void setNameDesProblemsDerDiagnoseNullFlavourDefiningCode( NullFlavour nameDesProblemsDerDiagnoseNullFlavourDefiningCode) { @@ -184,12 +177,12 @@ public NullFlavour getDatumZeitpunktDesAuftretensDerErstdiagnoseNullFlavourDefin return this.datumZeitpunktDesAuftretensDerErstdiagnoseNullFlavourDefiningCode ; } - public void setSchweregradDefiningCode(SchweregradDefiningCode schweregradDefiningCode) { - this.schweregradDefiningCode = schweregradDefiningCode; + public void setSchweregrad(DvCodedText schweregrad) { + this.schweregrad = schweregrad; } - public SchweregradDefiningCode getSchweregradDefiningCode() { - return this.schweregradDefiningCode ; + public DvCodedText getSchweregrad() { + return this.schweregrad ; } public void setSchweregradNullFlavourDefiningCode( @@ -281,4 +274,13 @@ public void setFeederAudit(FeederAudit feederAudit) { public FeederAudit getFeederAudit() { return this.feederAudit ; } + + public void setNameDesProblemsDerDiagnose( + VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice nameDesProblemsDerDiagnose) { + this.nameDesProblemsDerDiagnose = nameDesProblemsDerDiagnose; + } + + public VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice getNameDesProblemsDerDiagnose() { + return this.nameDesProblemsDerDiagnose ; + } } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluationContainment.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluationContainment.java index 1ddbed506..db7a23524 100644 --- a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluationContainment.java +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseEvaluationContainment.java @@ -2,6 +2,7 @@ import com.nedap.archie.rm.archetyped.FeederAudit; import com.nedap.archie.rm.datastructures.Cluster; +import com.nedap.archie.rm.datavalues.DvCodedText; import com.nedap.archie.rm.generic.PartyProxy; import java.lang.String; import java.time.temporal.TemporalAccessor; @@ -16,8 +17,6 @@ public class VorliegendeDiagnoseEvaluationContainment extends Containment { public SelectAqlField VORLIEGENDE_DIAGNOSE_EVALUATION = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "", "VorliegendeDiagnoseEvaluation", VorliegendeDiagnoseEvaluation.class, this); - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_DEFINING_CODE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value|defining_code", "nameDesProblemsDerDiagnoseDefiningCode", NameDesProblemsDerDiagnoseDefiningCode.class, this); - public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/null_flavour|defining_code", "nameDesProblemsDerDiagnoseNullFlavourDefiningCode", NullFlavour.class, this); public ListSelectAqlField KOERPERSTELLE = new ListAqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[openEHR-EHR-CLUSTER.anatomical_location.v1]", "koerperstelle", KoerperstelleCluster.class, this); @@ -26,7 +25,7 @@ public class VorliegendeDiagnoseEvaluationContainment extends Containment { public SelectAqlField DATUM_ZEITPUNKT_DES_AUFTRETENS_DER_ERSTDIAGNOSE_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0077]/null_flavour|defining_code", "datumZeitpunktDesAuftretensDerErstdiagnoseNullFlavourDefiningCode", NullFlavour.class, this); - public SelectAqlField SCHWEREGRAD_DEFINING_CODE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value|defining_code", "schweregradDefiningCode", SchweregradDefiningCode.class, this); + public SelectAqlField SCHWEREGRAD = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/value", "schweregrad", DvCodedText.class, this); public SelectAqlField SCHWEREGRAD_NULL_FLAVOUR_DEFINING_CODE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0005]/null_flavour|defining_code", "schweregradNullFlavourDefiningCode", NullFlavour.class, this); @@ -50,6 +49,8 @@ public class VorliegendeDiagnoseEvaluationContainment extends Containment { public SelectAqlField FEEDER_AUDIT = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/feeder_audit", "feederAudit", FeederAudit.class, this); + public SelectAqlField NAME_DES_PROBLEMS_DER_DIAGNOSE = new AqlFieldImp(VorliegendeDiagnoseEvaluation.class, "/data[at0001]/items[at0002]/value", "nameDesProblemsDerDiagnose", VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice.class, this); + private VorliegendeDiagnoseEvaluationContainment() { super("openEHR-EHR-EVALUATION.problem_diagnosis.v1"); } diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice.java new file mode 100644 index 000000000..0e08c6885 --- /dev/null +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice.java @@ -0,0 +1,11 @@ +package org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition; + +import javax.annotation.processing.Generated; + +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2021-07-12T18:58:20.593210+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" +) +public interface VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice { +} diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText.java new file mode 100644 index 000000000..b9f8b9c55 --- /dev/null +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText.java @@ -0,0 +1,32 @@ +package org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition; + +import com.nedap.archie.rm.datavalues.DvCodedText; +import javax.annotation.processing.Generated; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.RMEntity; + +@Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2021-07-12T18:58:20.592197+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" +) +@OptionFor("DV_CODED_TEXT") +public class VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText implements RMEntity, VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice { + /** + * Path: GECCO_Diagnose/Vorliegende Diagnose/Name des Problems/ der Diagnose/Name des Problems/ der Diagnose + * Description: Namentliche Identifikation des Problems oder der Diagnose. + */ + @Path("") + private DvCodedText nameDesProblemsDerDiagnose; + + public void setNameDesProblemsDerDiagnose(DvCodedText nameDesProblemsDerDiagnose) { + this.nameDesProblemsDerDiagnose = nameDesProblemsDerDiagnose; + } + + public DvCodedText getNameDesProblemsDerDiagnose() { + return this.nameDesProblemsDerDiagnose ; + } +} diff --git a/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvText.java b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvText.java new file mode 100644 index 000000000..0c7c67538 --- /dev/null +++ b/src/main/java/org/ehrbase/fhirbridge/ehr/opt/geccodiagnosecomposition/definition/VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvText.java @@ -0,0 +1,32 @@ +package org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition; + +import java.lang.String; +import javax.annotation.processing.Generated; +import org.ehrbase.client.annotations.Entity; +import org.ehrbase.client.annotations.OptionFor; +import org.ehrbase.client.annotations.Path; +import org.ehrbase.client.classgenerator.interfaces.RMEntity; + +@Entity +@Generated( + value = "org.ehrbase.client.classgenerator.ClassGenerator", + date = "2021-07-12T18:58:20.591271+02:00", + comments = "https://github.com/ehrbase/openEHR_SDK Version: 1.4.0" +) +@OptionFor("DV_TEXT") +public class VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvText implements RMEntity, VorliegendeDiagnoseNameDesProblemsDerDiagnoseChoice { + /** + * Path: GECCO_Diagnose/Vorliegende Diagnose/Name des Problems/ der Diagnose/Name des Problems/ der Diagnose + * Description: Namentliche Identifikation des Problems oder der Diagnose. + */ + @Path("|value") + private String nameDesProblemsDerDiagnoseValue; + + public void setNameDesProblemsDerDiagnoseValue(String nameDesProblemsDerDiagnoseValue) { + this.nameDesProblemsDerDiagnoseValue = nameDesProblemsDerDiagnoseValue; + } + + public String getNameDesProblemsDerDiagnoseValue() { + return this.nameDesProblemsDerDiagnoseValue ; + } +} diff --git a/src/main/resources/opt/GECCO_Diagnose.opt b/src/main/resources/opt/GECCO_Diagnose.opt index 908047d2c..57e9cb604 100644 --- a/src/main/resources/opt/GECCO_Diagnose.opt +++ b/src/main/resources/opt/GECCO_Diagnose.opt @@ -1,537 +1,548 @@ - - - diff --git a/src/test/java/org/ehrbase/fhirbridge/fhir/condition/GECCODiagnoseIT.java b/src/test/java/org/ehrbase/fhirbridge/fhir/condition/GECCODiagnoseIT.java index 767f41df2..b59fa8b42 100644 --- a/src/test/java/org/ehrbase/fhirbridge/fhir/condition/GECCODiagnoseIT.java +++ b/src/test/java/org/ehrbase/fhirbridge/fhir/condition/GECCODiagnoseIT.java @@ -1,13 +1,9 @@ package org.ehrbase.fhirbridge.fhir.condition; import org.ehrbase.fhirbridge.comparators.CustomTemporalAcessorComparator; -import org.ehrbase.fhirbridge.ehr.converter.ConversionException; import org.ehrbase.fhirbridge.ehr.converter.specific.geccodiagnose.GECCODiagnoseCompositionConverter; import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.GECCODiagnoseComposition; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.AusgeschlosseneDiagnoseEvaluation; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.KoerperstelleCluster; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.UnbekannteDiagnoseEvaluation; -import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.VorliegendeDiagnoseEvaluation; +import org.ehrbase.fhirbridge.ehr.opt.geccodiagnosecomposition.definition.*; import org.ehrbase.fhirbridge.fhir.AbstractMappingTestSetupIT; import org.hl7.fhir.r4.model.Condition; import org.javers.core.Javers; @@ -164,6 +160,7 @@ public Javers getJavers() { .registerValueObject(AusgeschlosseneDiagnoseEvaluation.class) .registerValueObject(VorliegendeDiagnoseEvaluation.class) .registerValueObject(UnbekannteDiagnoseEvaluation.class) + .registerValueObject(VorliegendeDiagnoseNameDesProblemsDerDiagnoseDvCodedText.class) .registerValueObject(KoerperstelleCluster.class) .build(); } diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-liver-disease.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-liver-disease.json index a5ee674f3..e00929499 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-liver-disease.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-liver-disease.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/15/_history/1", + "id" : "Condition/e7eb6d01-436a-4337-b384-ef4a06268b59/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -103,5 +103,60 @@ "archetype_node_id" : "at0001" } }, + "content" : [ { + "_type" : "EVALUATION", + "name" : { + "_type" : "DV_TEXT", + "value" : "Vorliegende Diagnose" + }, + "language" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "ISO_639-1" + }, + "code_string" : "de" + }, + "encoding" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "IANA_character-sets" + }, + "code_string" : "UTF-8" + }, + "subject" : { + "_type" : "PARTY_SELF" + }, + "data" : { + "_type" : "ITEM_TREE", + "name" : { + "_type" : "DV_TEXT", + "value" : "Structure" + }, + "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "Chronic liver disease", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "328383001" + } + }, + "archetype_node_id" : "at0002" + } ], + "archetype_node_id" : "at0001" + }, + "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" + } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" } \ No newline at end of file diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-lung-disease.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-lung-disease.json index 1eb407e5f..b9e201ed9 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-lung-disease.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-lung-disease.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/7/_history/1", + "id" : "Condition/0db91046-1c92-46b0-a205-6cbf90dafe13/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -103,5 +103,60 @@ "archetype_node_id" : "at0001" } }, + "content" : [ { + "_type" : "EVALUATION", + "name" : { + "_type" : "DV_TEXT", + "value" : "Vorliegende Diagnose" + }, + "language" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "ISO_639-1" + }, + "code_string" : "de" + }, + "encoding" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "IANA_character-sets" + }, + "code_string" : "UTF-8" + }, + "subject" : { + "_type" : "PARTY_SELF" + }, + "data" : { + "_type" : "ITEM_TREE", + "name" : { + "_type" : "DV_TEXT", + "value" : "Structure" + }, + "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "Chronic lung disease", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "413839001" + } + }, + "archetype_node_id" : "at0002" + } ], + "archetype_node_id" : "at0001" + }, + "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" + } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" } \ No newline at end of file diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-neurological-mental-diseases.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-neurological-mental-diseases.json index 64f0a7d4f..21781ba15 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-neurological-mental-diseases.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-chronic-neurological-mental-diseases.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/11/_history/1", + "id" : "Condition/7d8fc136-bffb-4781-8f5e-ed43fe7a76ee/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -142,7 +142,7 @@ }, "value" : { "_type" : "DV_CODED_TEXT", - "value" : "Mental disorder (disorder)", + "value" : "Mental disorder", "defining_code" : { "_type" : "CODE_PHRASE", "terminology_id" : { diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-complications-covid19-0.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-complications-covid19-0.json index a6061b248..5d3592c80 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-complications-covid19-0.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-complications-covid19-0.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/9/_history/1", + "id" : "Condition/a81214b6-210e-442a-a1bf-f039c6765f31/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -103,5 +103,60 @@ "archetype_node_id" : "at0001" } }, + "content" : [ { + "_type" : "EVALUATION", + "name" : { + "_type" : "DV_TEXT", + "value" : "Vorliegende Diagnose" + }, + "language" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "ISO_639-1" + }, + "code_string" : "de" + }, + "encoding" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "IANA_character-sets" + }, + "code_string" : "UTF-8" + }, + "subject" : { + "_type" : "PARTY_SELF" + }, + "data" : { + "_type" : "ITEM_TREE", + "name" : { + "_type" : "DV_TEXT", + "value" : "Structure" + }, + "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "Pre-renal acute kidney injury (disorder)", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "129561000119108" + } + }, + "archetype_node_id" : "at0002" + } ], + "archetype_node_id" : "at0001" + }, + "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" + } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" } \ No newline at end of file diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-diabetes-mellitus.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-diabetes-mellitus.json index ad8d63870..4662c4ad1 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-diabetes-mellitus.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-diabetes-mellitus.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/13/_history/1", + "id" : "Condition/a9e5b265-ca20-4baa-8d01-ecba99fd9799/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -103,5 +103,60 @@ "archetype_node_id" : "at0001" } }, + "content" : [ { + "_type" : "EVALUATION", + "name" : { + "_type" : "DV_TEXT", + "value" : "Vorliegende Diagnose" + }, + "language" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "ISO_639-1" + }, + "code_string" : "de" + }, + "encoding" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "IANA_character-sets" + }, + "code_string" : "UTF-8" + }, + "subject" : { + "_type" : "PARTY_SELF" + }, + "data" : { + "_type" : "ITEM_TREE", + "name" : { + "_type" : "DV_TEXT", + "value" : "Structure" + }, + "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "Diabetes mellitus", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "73211009" + } + }, + "archetype_node_id" : "at0002" + } ], + "archetype_node_id" : "at0001" + }, + "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" + } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" } \ No newline at end of file diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-organ-recipient.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-organ-recipient.json index 772ea9cd6..547adf8db 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-organ-recipient.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-organ-recipient.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/53/_history/1", + "id" : "Condition/db25ac4d-6548-4f30-ab37-d16d3c0171db/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -26,13 +26,17 @@ } }, "language" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "ISO_639-1" }, "code_string" : "de" }, "territory" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "ISO_3166-1" }, "code_string" : "DE" @@ -41,7 +45,9 @@ "_type" : "DV_CODED_TEXT", "value" : "event", "defining_code" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "openehr" }, "code_string" : "433" @@ -60,7 +66,9 @@ "_type" : "DV_CODED_TEXT", "value" : "secondary medical care", "defining_code" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "openehr" }, "code_string" : "232" @@ -82,7 +90,9 @@ "_type" : "DV_CODED_TEXT", "value" : "Transplant medicine", "defining_code" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "SNOMED Clinical Terms" }, "code_string" : "788415003" @@ -100,13 +110,17 @@ "value" : "Vorliegende Diagnose" }, "language" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "ISO_639-1" }, "code_string" : "de" }, "encoding" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "IANA_character-sets" }, "code_string" : "UTF-8" @@ -121,6 +135,25 @@ "value" : "Structure" }, "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "History of being a tissue or organ recipient", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "161663000" + } + }, + "archetype_node_id" : "at0002" + }, { "_type" : "CLUSTER", "name" : { "_type" : "DV_TEXT", @@ -136,7 +169,9 @@ "_type" : "DV_CODED_TEXT", "value" : "Entire liver (body structure)", "defining_code" : { + "_type" : "CODE_PHRASE", "terminology_id" : { + "_type" : "TERMINOLOGY_ID", "value" : "SNOMED Clinical Terms" }, "code_string" : "181268008" @@ -151,4 +186,4 @@ "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" -} +} \ No newline at end of file diff --git a/src/test/resources/Condition/GECCODiagnose/paragon-create-rheumatological-immunological-diseases-rheumatism.json b/src/test/resources/Condition/GECCODiagnose/paragon-create-rheumatological-immunological-diseases-rheumatism.json index 404c221ef..84d9f3d22 100644 --- a/src/test/resources/Condition/GECCODiagnose/paragon-create-rheumatological-immunological-diseases-rheumatism.json +++ b/src/test/resources/Condition/GECCODiagnose/paragon-create-rheumatological-immunological-diseases-rheumatism.json @@ -17,7 +17,7 @@ "_type" : "FEEDER_AUDIT", "originating_system_item_ids" : [ { "_type" : "DV_IDENTIFIER", - "id" : "Condition/17/_history/1", + "id" : "Condition/1dd11c71-0e98-47f3-ad8c-79842fc70e75/_history/1", "type" : "fhir_logical_id" } ], "originating_system_audit" : { @@ -103,5 +103,60 @@ "archetype_node_id" : "at0001" } }, + "content" : [ { + "_type" : "EVALUATION", + "name" : { + "_type" : "DV_TEXT", + "value" : "Vorliegende Diagnose" + }, + "language" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "ISO_639-1" + }, + "code_string" : "de" + }, + "encoding" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "IANA_character-sets" + }, + "code_string" : "UTF-8" + }, + "subject" : { + "_type" : "PARTY_SELF" + }, + "data" : { + "_type" : "ITEM_TREE", + "name" : { + "_type" : "DV_TEXT", + "value" : "Structure" + }, + "items" : [ { + "_type" : "ELEMENT", + "name" : { + "_type" : "DV_TEXT", + "value" : "Name des Problems/ der Diagnose" + }, + "value" : { + "_type" : "DV_CODED_TEXT", + "value" : "Rheumatism", + "defining_code" : { + "_type" : "CODE_PHRASE", + "terminology_id" : { + "_type" : "TERMINOLOGY_ID", + "value" : "SNOMED Clinical Terms" + }, + "code_string" : "396332003" + } + }, + "archetype_node_id" : "at0002" + } ], + "archetype_node_id" : "at0001" + }, + "archetype_node_id" : "openEHR-EHR-EVALUATION.problem_diagnosis.v1" + } ], "archetype_node_id" : "openEHR-EHR-COMPOSITION.registereintrag.v1" } \ No newline at end of file